final clone maps -> original maps change. also fixed novice grounds map in char.c. fixed socked_enchant npc

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9064 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -3,6 +3,8 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2006/10/25
+	* Got rid of clones in src: old Novice Grounds map -> new_zone0? [Lupus]
 2006/10/24
 	* Removed again your mdef reducing "petrifying" time as apparently it can't
 	  be reduced by mdef. [Skotlex]

conf-tmpl/char_athena.conf

@@ -127,7 +127,7 @@ backup_txt: save/athena_backup.txt
 friends_txt: save/friends.txt
 
 // Start point, Map name followed by coordinates (x,y)
-start_point: new_1-1.gat,53,111
+start_point: new_zone01.gat,53,111
 
 // Starting weapon for new characters
 start_weapon: 1201

conf-tmpl/mapflag/indoors.txt

@@ -28,9 +28,7 @@ aldeba_in.gat	mapflag	indoors
 monk_in.gat	mapflag	indoors
 prt_are_in.gat	mapflag	indoors
 arena_room.gat	mapflag	indoors
-sword_1-1.gat	mapflag	indoors
-//sword_2-1.gat	mapflag	indoors
-//sword_3-1.gat	mapflag	indoors
+job_sword1.gat	mapflag	indoors
 xmas_in.gat	mapflag	indoors
 cmd_in01.gat	mapflag	indoors
 cmd_in02.gat	mapflag	indoors

conf-tmpl/mapflag/nobranch.txt

@@ -29,10 +29,10 @@ lou_in01.gat	mapflag	nobranch
 lou_in02.gat	mapflag	nobranch
 moc_castle.gat	mapflag	nobranch
 morocc_in.gat	mapflag	nobranch
-new_1-1.gat	mapflag	nobranch
-new_1-2.gat	mapflag	nobranch
-new_1-3.gat	mapflag	nobranch
-new_1-4.gat	mapflag	nobranch
+new_zone01.gat	mapflag	nobranch
+new_zone02.gat	mapflag	nobranch
+new_zone03.gat	mapflag	nobranch
+new_zone04.gat	mapflag	nobranch
 nif_in.gat	mapflag	nobranch
 payon_in01.gat	mapflag	nobranch
 payon_in02.gat	mapflag	nobranch
@@ -72,9 +72,7 @@ ra_temsky.gat	mapflag	nobranch
 que_rachel.gat	mapflag	nobranch
 
 // Job Quests ====================
-sword_1-1.gat	mapflag	nobranch
-//sword_2-1.gat	mapflag	nobranch
-//sword_3-1.gat	mapflag	nobranch
+job_sword1.gat	mapflag	nobranch
 job_thief1.gat	mapflag	nobranch
 // 2-1
 job_knt.gat	mapflag	nobranch

conf-tmpl/mapflag/noexp.txt

@@ -8,7 +8,7 @@
 
 // Location for Job's Quests
 job_thief1.gat	mapflag	noexp
-sword_1-1.gat	mapflag	noexp
+job_sword1.gat	mapflag	noexp
 in_moc_16.gat	mapflag	noexp
 job_hunte.gat	mapflag	noexp
 job_knt.gat	mapflag	noexp

conf-tmpl/mapflag/noicewall.txt

@@ -52,9 +52,7 @@ prt_church.gat	mapflag	noicewall
 prt_in.gat	mapflag	noicewall
 prontera.gat	mapflag noicewall
 sec_in01.gat	mapflag	noicewall
-sword_1-1.gat	mapflag	noicewall
-//sword_2-1.gat	mapflag	noicewall
-//sword_3-1.gat	mapflag	noicewall
+job_sword1.gat	mapflag	noicewall
 um_in.gat	mapflag	noicewall
 umbala.gat	mapflag	noicewall
 xmas_in.gat	mapflag	noicewall

conf-tmpl/mapflag/noloot.txt

@@ -7,7 +7,7 @@
 //============================================================
 
 // Location for Job's Quests
-sword_1-1.gat	mapflag	noloot
+job_sword1.gat	mapflag	noloot
 in_moc_16.gat	mapflag	noloot
 job_hunte.gat	mapflag	noloot
 job_knt.gat	mapflag	noloot

conf-tmpl/mapflag/nomemo.txt

@@ -30,10 +30,10 @@ moc_castle.gat	mapflag	nomemo
 morocc_in.gat	mapflag	nomemo
 niflheim.gat	mapflag	nomemo
 nif_in.gat	mapflag	nomemo
-new_1-1.gat	mapflag	nomemo
-new_1-2.gat	mapflag	nomemo
-new_1-3.gat	mapflag	nomemo
-new_1-4.gat	mapflag	nomemo
+new_zone01.gat	mapflag	nomemo
+new_zone02.gat	mapflag	nomemo
+new_zone03.gat	mapflag	nomemo
+new_zone04.gat	mapflag	nomemo
 pay_arche.gat	mapflag	nomemo
 payon_in01.gat	mapflag	nomemo
 payon_in02.gat	mapflag	nomemo
@@ -149,9 +149,7 @@ yuno_fild10.gat	mapflag	nomemo
 
 // Job Quests ================
 // First Job Class
-sword_1-1.gat	mapflag	nomemo
-//sword_2-1.gat	mapflag	nomemo
-//sword_3-1.gat	mapflag	nomemo
+job_sword1.gat	mapflag	nomemo
 job_thief1.gat	mapflag	nomemo
 job_star.gat	mapflag	nomemo
 // Primary Second Job Class

conf-tmpl/mapflag/nopenalty.txt

@@ -42,10 +42,10 @@ lou_in02.gat	mapflag	nopenalty
 morocc.gat	mapflag	nopenalty
 moc_castle.gat	mapflag	nopenalty
 morocc_in.gat	mapflag	nopenalty
-new_1-1.gat	mapflag	nopenalty
-new_1-2.gat	mapflag	nopenalty
-new_1-3.gat	mapflag	nopenalty
-new_1-4.gat	mapflag	nopenalty
+new_zone01.gat	mapflag	nopenalty
+new_zone02.gat	mapflag	nopenalty
+new_zone03.gat	mapflag	nopenalty
+new_zone04.gat	mapflag	nopenalty
 nif_in.gat	mapflag	nopenalty
 pay_arche.gat	mapflag	nopenalty
 payon.gat	mapflag	nopenalty
@@ -98,9 +98,7 @@ kh_vila.gat	mapflag	nopenalty
 ayothaya.gat	mapflag	nopenalty
 
 // Job Quests ========================
-sword_1-1.gat	mapflag	nopenalty
-//sword_2-1.gat	mapflag	nopenalty
-//sword_3-1.gat	mapflag	nopenalty
+job_sword1.gat	mapflag	nopenalty
 job_thief1.gat	mapflag	nopenalty
 // 2-1 -----------------------
 job_prist.gat	mapflag	nopenalty

conf-tmpl/mapflag/nopvp.txt

@@ -55,9 +55,7 @@ prt_church.gat	mapflag	pvp	off
 prt_in.gat	mapflag	pvp	off
 prontera.gat	mapflag	pvp	off
 sec_in01.gat	mapflag	pvp	off
-sword_1-1.gat	mapflag	pvp	off
-//sword_2-1.gat	mapflag	pvp	off
-//sword_3-1.gat	mapflag	pvp	off
+job_sword1.gat	mapflag	pvp	off
 um_in.gat	mapflag	pvp	off
 umbala.gat	mapflag	pvp	off
 xmas_in.gat	mapflag	pvp	off

conf-tmpl/mapflag/noreturn.txt

@@ -32,10 +32,10 @@ lou_in01.gat	mapflag	noreturn
 lou_in02.gat	mapflag	noreturn
 moc_castle.gat	mapflag	noreturn
 morocc_in.gat	mapflag	noreturn
-new_1-1.gat	mapflag	noreturn
-new_1-2.gat	mapflag	noreturn
-new_1-3.gat	mapflag	noreturn
-new_1-4.gat	mapflag	noreturn
+new_zone01.gat	mapflag	noreturn
+new_zone02.gat	mapflag	noreturn
+new_zone03.gat	mapflag	noreturn
+new_zone04.gat	mapflag	noreturn
 nif_in.gat	mapflag	noreturn
 payon_in01.gat	mapflag	noreturn
 payon_in02.gat	mapflag	noreturn
@@ -74,9 +74,7 @@ kh_school.gat	mapflag	noreturn
 kh_vila.gat	mapflag	noreturn
 
 // Job Quests ====================
-sword_1-1.gat	mapflag	noreturn
-//sword_2-1.gat	mapflag	noreturn
-//sword_3-1.gat	mapflag	noreturn
+job_sword1.gat	mapflag	noreturn
 job_thief1.gat	mapflag	noreturn
 // 2-1 -----------------------
 job_hunte.gat	mapflag	noreturn

conf-tmpl/mapflag/nosave.txt

@@ -2,13 +2,11 @@
 //= Map flags that disable auto saving
 //===== By: ==================================================
 //= eAthena Dev Team
-//= 1.4 [Lupus]
+//= 1.5 [Lupus]
 //===== Current Version: =====================================
 
 // Job Quests ====================
-sword_1-1.gat	mapflag	nosave	SavePoint
-//sword_2-1.gat	mapflag	nosave	SavePoint
-//sword_3-1.gat	mapflag	nosave	SavePoint
+job_sword1.gat	mapflag	nosave	SavePoint
 //job_thief1.gat	mapflag	nosave	SavePoint
 // 2-1
 job_knt.gat	mapflag	nosave	SavePoint

conf-tmpl/mapflag/noteleport.txt

@@ -2,7 +2,7 @@
 //= Map flags that disable use of fly wings
 //===== By: ==================================================
 //= eAthena Dev Team
-//= 1.5 [Lupus]
+//= 1.6 [Lupus]
 //===== Notes: ===============================================
 //= For disabling Butterfly wings use noreturn
 //===== Current Version: =====================================
@@ -31,10 +31,10 @@ lou_in01.gat	mapflag	noteleport
 lou_in02.gat	mapflag	noteleport
 moc_castle.gat	mapflag	noteleport
 morocc_in.gat	mapflag	noteleport
-new_1-1.gat	mapflag	noteleport
-new_1-2.gat	mapflag	noteleport
-new_1-3.gat	mapflag	noteleport
-new_1-4.gat	mapflag	noteleport
+new_zone01.gat	mapflag	noteleport
+new_zone02.gat	mapflag	noteleport
+new_zone03.gat	mapflag	noteleport
+new_zone04.gat	mapflag	noteleport
 nif_in.gat	mapflag	noteleport
 payon_in01.gat	mapflag	noteleport
 payon_in02.gat	mapflag	noteleport
@@ -96,9 +96,7 @@ kh_school.gat	mapflag	noteleport
 kh_vila.gat	mapflag	noteleport
 
 // Job Quests ====================
-sword_1-1.gat	mapflag	noteleport
-//sword_2-1.gat	mapflag	noteleport
-//sword_3-1.gat	mapflag	noteleport
+job_sword1.gat	mapflag	noteleport
 job_thief1.gat	mapflag	noteleport
 // 2-1 -----------------------
 job_prist.gat	mapflag	noteleport

conf-tmpl/maps_athena.conf

@@ -136,14 +136,14 @@ map: moc_ruins.gat
 map: monk_in.gat
 map: morocc.gat
 map: morocc_in.gat
-//map: new_zone01.gat
-//map: new_zone02.gat
-//map: new_zone03.gat
-//map: new_zone04.gat
-map: new_1-1.gat
-map: new_1-2.gat
-map: new_1-3.gat
-map: new_1-4.gat
+map: new_zone01.gat
+map: new_zone02.gat
+map: new_zone03.gat
+map: new_zone04.gat
+//map: new_1-1.gat
+//map: new_1-2.gat
+//map: new_1-3.gat
+//map: new_1-4.gat
 //map: new_2-1.gat
 //map: new_2-2.gat
 //map: new_2-3.gat
@@ -310,7 +310,7 @@ map: pvp_y_8-3.gat
 map: pvp_y_8-4.gat
 map: pvp_y_8-5.gat
 map: pvp_y_room.gat
-map: sword_1-1.gat
+//map: sword_1-1.gat
 //map: sword_2-1.gat
 //map: sword_3-1.gat
 map: treasure01.gat
@@ -395,7 +395,7 @@ map: job_hunte.gat
 map: job_knt.gat
 //map: job_priest.gat
 map: job_prist.gat
-//map: job_sword1.gat
+map: job_sword1.gat
 //map: job_wizard.gat
 map: job_wiz.gat
 map: pay_gld.gat

npc/Changelog.txt

@@ -33,6 +33,11 @@ KarLaeda
 
 Date		Added
 ======
+10/25
+	* Got rid of colned maps. Replaced them by their originals [Lupus]
+		new_1-?.gnd -> new_zone0?.gnd
+		sword_1-1.gnd -> job_sword1.gnd
+	- Fixed item id in socket_enchant.txt, thx to norbert
 10/24
 	* Spawn updates for Einbroch Fields [Playtester]
 	* Updated Novie Training Grounds: typos, bugs, removed extra maps, duplicates [Lupus]

npc/custom/Lance/FR_WeatherController.c

@@ -96,10 +96,10 @@ setmapflag "moc_pryd06.gat",mf_clouds;
 setmapflag "moc_prydb1.gat",mf_clouds;
 setmapflag "moc_ruins.gat",mf_clouds;
 setmapflag "morocc.gat",mf_clouds;
-setmapflag "new_1-1.gat",mf_clouds;
-setmapflag "new_1-2.gat",mf_clouds;
-setmapflag "new_1-3.gat",mf_clouds;
-setmapflag "new_1-4.gat",mf_clouds;
+//setmapflag "new_1-1.gat",mf_clouds;
+//setmapflag "new_1-2.gat",mf_clouds;
+//setmapflag "new_1-3.gat",mf_clouds;
+//setmapflag "new_1-4.gat",mf_clouds;
 setmapflag "pay_arche.gat",mf_clouds;
 setmapflag "pay_fild01.gat",mf_clouds;
 setmapflag "pay_fild02.gat",mf_clouds;

npc/jobs/1-1/swordman.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 1.6a
+//= 1.7
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
@@ -20,6 +20,7 @@
 //= 1.5.2 Now saves/restores all quest skills [Lupus]
 //= 1.5.3 Removed Duplicates [Silent]
 //= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus]
+//= 1.7 changed location from its clone to the original [Lupus]
 //============================================================ 
 
 
@@ -271,7 +272,7 @@ izlude_in.gat,30,163,8	script	Test Hall Staff	105,{
 		savepoint "izlude_in.gat",39,170;
 		stopnpctimer;
 		initnpctimer "TimerSwrdmn";
-		warp "sword_1-1.gat",10,245;
+		warp "job_sword1.gat",10,245;
 		end;
 
 	M_no:
@@ -293,24 +294,24 @@ L_Option3:
 	goto M_yes;
 	end;
 }
-sword_1-1.gat,1,1,0	script	TimerSwrdmn	-1,{
+job_sword1.gat,1,1,0	script	TimerSwrdmn	-1,{
 	OnTimer4000:
-		areaannounce "sword_1-1.gat", 0, 0, 400, 400, "[Test Hall Staff]: Your 7 minutes starts now!",0;
+		areaannounce "job_sword1.gat", 0, 0, 400, 400, "[Test Hall Staff]: Your 7 minutes starts now!",0;
 		end;
 	OnTimer184000:
-		areaannounce "sword_1-1.gat", 0, 0, 400, 400, "[Test Hall Staff]: You have 4 minutes left!",0;
+		areaannounce "job_sword1.gat", 0, 0, 400, 400, "[Test Hall Staff]: You have 4 minutes left!",0;
 		end;
 	OnTimer304000:
-		areaannounce "sword_1-1.gat", 0, 0, 400, 400, "[Test Hall Staff]: You have 2 minutes left!",0;
+		areaannounce "job_sword1.gat", 0, 0, 400, 400, "[Test Hall Staff]: You have 2 minutes left!",0;
 		end;
 	OnTimer364000:
-		areaannounce "sword_1-1.gat", 0, 0, 400, 400, "[Test Hall Staff]: You have 1 minutes left!",0;
+		areaannounce "job_sword1.gat", 0, 0, 400, 400, "[Test Hall Staff]: You have 1 minutes left!",0;
 		end;
 	OnTimer394000:
-		areaannounce "sword_1-1.gat", 0, 0, 400, 400, "[Test Hall Staff]: You have 30 seconds left, hurry!",0;
+		areaannounce "job_sword1.gat", 0, 0, 400, 400, "[Test Hall Staff]: You have 30 seconds left, hurry!",0;
 		end;
 	OnTimer424000:
-		areaannounce "sword_1-1.gat", 0, 0, 400, 400, "[Test Hall Staff]: Your times up!  You failed the test.",0;
+		areaannounce "job_sword1.gat", 0, 0, 400, 400, "[Test Hall Staff]: Your times up!  You failed the test.",0;
 		end;
 	OnTimer428000:
 		stopnpctimer;
@@ -320,7 +321,7 @@ sword_1-1.gat,1,1,0	script	TimerSwrdmn	-1,{
 
 
 // -- Medic 1 --
-sword_1-1.gat,230,245,2	script	Medic#01	105,{
+job_sword1.gat,230,245,2	script	Medic#01	105,{
 	mes "[Medic]";
 	mes "This is the 1st check point! You're doing great!";
 	percentheal 100, 100;
@@ -328,7 +329,7 @@ sword_1-1.gat,230,245,2	script	Medic#01	105,{
 }
 	
 // -- Test Hall Staff 2 --
-sword_1-1.gat,230,242,2	script	Test Hall Staff#01	105,{
+job_sword1.gat,230,242,2	script	Test Hall Staff#01	105,{
 	mes "[Test Hall Staff]";
 	mes "Do you surrender?";
 	next;
@@ -344,7 +345,7 @@ sword_1-1.gat,230,242,2	script	Test Hall Staff#01	105,{
 }
 
 // -- Medic 2 --
-sword_1-1.gat,230,207,2	script	Medic#02	105,{
+job_sword1.gat,230,207,2	script	Medic#02	105,{
 	mes "[Medic]";
 	mes "This is the 2nd check point! Keep up the good work!";
 	percentheal 100, 100;
@@ -352,7 +353,7 @@ sword_1-1.gat,230,207,2	script	Medic#02	105,{
 }
 
 // -- Test Hall Staff 3 --
-sword_1-1.gat,230,204,2	script	Test Hall Staff#02	105,{
+job_sword1.gat,230,204,2	script	Test Hall Staff#02	105,{
 	mes "[Test Hall Staff]";
 	mes "Do you surrender?";
 	next;
@@ -368,7 +369,7 @@ sword_1-1.gat,230,204,2	script	Test Hall Staff#02	105,{
 }
 
 // -- Mae (Medic 3) --		
-sword_1-1.gat,223,167,2	script	Mae	92,{
+job_sword1.gat,223,167,2	script	Mae	92,{
 	mes "[Mae]";
 	mes "I sincerely congratulate you for passing the test!";
 	mes "I've already sent your test results to the 'Master Swordsman'.";
@@ -390,410 +391,410 @@ sword_1-1.gat,223,167,2	script	Mae	92,{
 
 // -- First Section --
 // - Left -
-sword_1-1.gat,22,172,1	script	1green_1::green	139,0,0,{
+job_sword1.gat,22,172,1	script	1green_1::green	139,0,0,{
 	heal (-4),0;
 	end;
 }
 
 // -- Duplicates --
-sword_1-1.gat,22,173,1	duplicate(green)	1green_2	139,0,0
-sword_1-1.gat,23,172,1	duplicate(green)	1green_3	139,0,0
-sword_1-1.gat,23,173,1	duplicate(green)	1green_4	139,0,0
-sword_1-1.gat,34,172,1	duplicate(green)	1green_5	139,0,0
-sword_1-1.gat,34,173,1	duplicate(green)	1green_6	139,0,0
-sword_1-1.gat,35,172,1	duplicate(green)	1green_7	139,0,0
-sword_1-1.gat,35,173,1	duplicate(green)	1green_8	139,0,0
-sword_1-1.gat,66,170,1	duplicate(green)	1green_9	139,0,0
-sword_1-1.gat,66,171,1	duplicate(green)	1green_10	139,0,0
-sword_1-1.gat,67,170,1	duplicate(green)	1green_11	139,0,0
-sword_1-1.gat,67,171,1	duplicate(green)	1green_12	139,0,0
-sword_1-1.gat,70,170,1	duplicate(green)	1green_13	139,0,0
-sword_1-1.gat,70,171,1	duplicate(green)	1green_14	139,0,0
-sword_1-1.gat,71,170,1	duplicate(green)	1green_15	139,0,0
-sword_1-1.gat,71,171,1	duplicate(green)	1green_16	139,0,0
+job_sword1.gat,22,173,1	duplicate(green)	1green_2	139,0,0
+job_sword1.gat,23,172,1	duplicate(green)	1green_3	139,0,0
+job_sword1.gat,23,173,1	duplicate(green)	1green_4	139,0,0
+job_sword1.gat,34,172,1	duplicate(green)	1green_5	139,0,0
+job_sword1.gat,34,173,1	duplicate(green)	1green_6	139,0,0
+job_sword1.gat,35,172,1	duplicate(green)	1green_7	139,0,0
+job_sword1.gat,35,173,1	duplicate(green)	1green_8	139,0,0
+job_sword1.gat,66,170,1	duplicate(green)	1green_9	139,0,0
+job_sword1.gat,66,171,1	duplicate(green)	1green_10	139,0,0
+job_sword1.gat,67,170,1	duplicate(green)	1green_11	139,0,0
+job_sword1.gat,67,171,1	duplicate(green)	1green_12	139,0,0
+job_sword1.gat,70,170,1	duplicate(green)	1green_13	139,0,0
+job_sword1.gat,70,171,1	duplicate(green)	1green_14	139,0,0
+job_sword1.gat,71,170,1	duplicate(green)	1green_15	139,0,0
+job_sword1.gat,71,171,1	duplicate(green)	1green_16	139,0,0
 
 // - Right -
-sword_1-1.gat,22,164,1	duplicate(green)	1green_17	139,0,0
-sword_1-1.gat,22,165,1	duplicate(green)	1green_18	139,0,0
-sword_1-1.gat,23,164,1	duplicate(green)	1green_19	139,0,0
-sword_1-1.gat,23,165,1	duplicate(green)	1green_20	139,0,0
-sword_1-1.gat,34,164,1	duplicate(green)	1green_21	139,0,0
-sword_1-1.gat,34,165,1	duplicate(green)	1green_22	139,0,0
-sword_1-1.gat,35,164,1	duplicate(green)	1green_23	139,0,0
-sword_1-1.gat,35,165,1	duplicate(green)	1green_24	139,0,0
-sword_1-1.gat,66,166,1	duplicate(green)	1green_25	139,0,0
-sword_1-1.gat,66,167,1	duplicate(green)	1green_26	139,0,0
-sword_1-1.gat,67,166,1	duplicate(green)	1green_27	139,0,0
-sword_1-1.gat,67,167,1	duplicate(green)	1green_28	139,0,0
-sword_1-1.gat,70,166,1	duplicate(green)	1green_29	139,0,0
-sword_1-1.gat,70,167,1	duplicate(green)	1green_30	139,0,0
-sword_1-1.gat,71,166,1	duplicate(green)	1green_31	139,0,0
-sword_1-1.gat,71,167,1	duplicate(green)	1green_32	139,0,0
+job_sword1.gat,22,164,1	duplicate(green)	1green_17	139,0,0
+job_sword1.gat,22,165,1	duplicate(green)	1green_18	139,0,0
+job_sword1.gat,23,164,1	duplicate(green)	1green_19	139,0,0
+job_sword1.gat,23,165,1	duplicate(green)	1green_20	139,0,0
+job_sword1.gat,34,164,1	duplicate(green)	1green_21	139,0,0
+job_sword1.gat,34,165,1	duplicate(green)	1green_22	139,0,0
+job_sword1.gat,35,164,1	duplicate(green)	1green_23	139,0,0
+job_sword1.gat,35,165,1	duplicate(green)	1green_24	139,0,0
+job_sword1.gat,66,166,1	duplicate(green)	1green_25	139,0,0
+job_sword1.gat,66,167,1	duplicate(green)	1green_26	139,0,0
+job_sword1.gat,67,166,1	duplicate(green)	1green_27	139,0,0
+job_sword1.gat,67,167,1	duplicate(green)	1green_28	139,0,0
+job_sword1.gat,70,166,1	duplicate(green)	1green_29	139,0,0
+job_sword1.gat,70,167,1	duplicate(green)	1green_30	139,0,0
+job_sword1.gat,71,166,1	duplicate(green)	1green_31	139,0,0
+job_sword1.gat,71,167,1	duplicate(green)	1green_32	139,0,0
 // - Center -
-sword_1-1.gat,86,168,1	duplicate(green)	1green_33	139,0,0
-sword_1-1.gat,86,169,1	duplicate(green)	1green_34	139,0,0
-sword_1-1.gat,87,168,1	duplicate(green)	1green_35	139,0,0
-sword_1-1.gat,87,169,1	duplicate(green)	1green_36	139,0,0
+job_sword1.gat,86,168,1	duplicate(green)	1green_33	139,0,0
+job_sword1.gat,86,169,1	duplicate(green)	1green_34	139,0,0
+job_sword1.gat,87,168,1	duplicate(green)	1green_35	139,0,0
+job_sword1.gat,87,169,1	duplicate(green)	1green_36	139,0,0
 
 // -- Second Section --
 // - Left -
-sword_1-1.gat,83,171,1	duplicate(green)	2green_1	139,0,1
-sword_1-1.gat,82,171,1	duplicate(green)	2green_2	139,0,1
-sword_1-1.gat,90,171,1	duplicate(green)	2green_3	139,0,1
-sword_1-1.gat,91,171,1	duplicate(green)	2green_4	139,0,1
-sword_1-1.gat,84,173,1	duplicate(green)	2green_5	139,1,0
-sword_1-1.gat,90,173,1	duplicate(green)	2green_6	139,1,0
-sword_1-1.gat,83,166,1	duplicate(green)	2green_7	139,0,1
-sword_1-1.gat,82,166,1	duplicate(green)	2green_8	139,0,1
-sword_1-1.gat,90,166,1	duplicate(green)	2green_9	139,0,1
-sword_1-1.gat,91,166,1	duplicate(green)	2green_10	139,0,1
-sword_1-1.gat,84,164,1	duplicate(green)	2green_11	139,1,0
-sword_1-1.gat,90,164,1	duplicate(green)	2green_12	139,1,0
-sword_1-1.gat,102,168,1	duplicate(green)	2green_13	139,0,0
-sword_1-1.gat,102,169,1	duplicate(green)	2green_14	139,0,0
+job_sword1.gat,83,171,1	duplicate(green)	2green_1	139,0,1
+job_sword1.gat,82,171,1	duplicate(green)	2green_2	139,0,1
+job_sword1.gat,90,171,1	duplicate(green)	2green_3	139,0,1
+job_sword1.gat,91,171,1	duplicate(green)	2green_4	139,0,1
+job_sword1.gat,84,173,1	duplicate(green)	2green_5	139,1,0
+job_sword1.gat,90,173,1	duplicate(green)	2green_6	139,1,0
+job_sword1.gat,83,166,1	duplicate(green)	2green_7	139,0,1
+job_sword1.gat,82,166,1	duplicate(green)	2green_8	139,0,1
+job_sword1.gat,90,166,1	duplicate(green)	2green_9	139,0,1
+job_sword1.gat,91,166,1	duplicate(green)	2green_10	139,0,1
+job_sword1.gat,84,164,1	duplicate(green)	2green_11	139,1,0
+job_sword1.gat,90,164,1	duplicate(green)	2green_12	139,1,0
+job_sword1.gat,102,168,1	duplicate(green)	2green_13	139,0,0
+job_sword1.gat,102,169,1	duplicate(green)	2green_14	139,0,0
 // - Right -
-sword_1-1.gat,102,172,1	duplicate(green)	2green_15	139,0,0
-sword_1-1.gat,102,173,1	duplicate(green)	2green_16	139,0,0
-sword_1-1.gat,103,172,1	duplicate(green)	2green_17	139,0,0
-sword_1-1.gat,103,173,1	duplicate(green)	2green_18	139,0,0
-sword_1-1.gat,106,172,1	duplicate(green)	2green_19	139,0,0
-sword_1-1.gat,106,173,1	duplicate(green)	2green_20	139,0,0
-sword_1-1.gat,107,172,1	duplicate(green)	2green_21	139,0,0
-sword_1-1.gat,107,173,1	duplicate(green)	2green_22	139,0,0
-sword_1-1.gat,110,172,1	duplicate(green)	2green_23	139,0,0
-sword_1-1.gat,110,173,1	duplicate(green)	2green_24	139,0,0
-sword_1-1.gat,111,172,1	duplicate(green)	2green_25	139,0,0
-sword_1-1.gat,111,173,1	duplicate(green)	2green_26	139,0,0
+job_sword1.gat,102,172,1	duplicate(green)	2green_15	139,0,0
+job_sword1.gat,102,173,1	duplicate(green)	2green_16	139,0,0
+job_sword1.gat,103,172,1	duplicate(green)	2green_17	139,0,0
+job_sword1.gat,103,173,1	duplicate(green)	2green_18	139,0,0
+job_sword1.gat,106,172,1	duplicate(green)	2green_19	139,0,0
+job_sword1.gat,106,173,1	duplicate(green)	2green_20	139,0,0
+job_sword1.gat,107,172,1	duplicate(green)	2green_21	139,0,0
+job_sword1.gat,107,173,1	duplicate(green)	2green_22	139,0,0
+job_sword1.gat,110,172,1	duplicate(green)	2green_23	139,0,0
+job_sword1.gat,110,173,1	duplicate(green)	2green_24	139,0,0
+job_sword1.gat,111,172,1	duplicate(green)	2green_25	139,0,0
+job_sword1.gat,111,173,1	duplicate(green)	2green_26	139,0,0
 // - Center -
-sword_1-1.gat,102,164,1	duplicate(green)	2green_27	139,0,0
-sword_1-1.gat,102,165,1	duplicate(green)	2green_28	139,0,0
-sword_1-1.gat,103,164,1	duplicate(green)	2green_29	139,0,0
-sword_1-1.gat,103,165,1	duplicate(green)	2green_30	139,0,0
-sword_1-1.gat,106,164,1	duplicate(green)	2green_31	139,0,0
-sword_1-1.gat,106,165,1	duplicate(green)	2green_32	139,0,0
-sword_1-1.gat,107,164,1	duplicate(green)	2green_33	139,0,0
-sword_1-1.gat,107,165,1	duplicate(green)	2green_34	139,0,0
-sword_1-1.gat,110,164,1	duplicate(green)	2green_35	139,0,0
-sword_1-1.gat,110,165,1	duplicate(green)	2green_36	139,0,0
-sword_1-1.gat,111,164,1	duplicate(green)	2green_37	139,0,0
-sword_1-1.gat,111,165,1	duplicate(green)	2green_38	139,0,0
+job_sword1.gat,102,164,1	duplicate(green)	2green_27	139,0,0
+job_sword1.gat,102,165,1	duplicate(green)	2green_28	139,0,0
+job_sword1.gat,103,164,1	duplicate(green)	2green_29	139,0,0
+job_sword1.gat,103,165,1	duplicate(green)	2green_30	139,0,0
+job_sword1.gat,106,164,1	duplicate(green)	2green_31	139,0,0
+job_sword1.gat,106,165,1	duplicate(green)	2green_32	139,0,0
+job_sword1.gat,107,164,1	duplicate(green)	2green_33	139,0,0
+job_sword1.gat,107,165,1	duplicate(green)	2green_34	139,0,0
+job_sword1.gat,110,164,1	duplicate(green)	2green_35	139,0,0
+job_sword1.gat,110,165,1	duplicate(green)	2green_36	139,0,0
+job_sword1.gat,111,164,1	duplicate(green)	2green_37	139,0,0
+job_sword1.gat,111,165,1	duplicate(green)	2green_38	139,0,0
 
 
 // -- Third Section --
-sword_1-1.gat,121,172,1	duplicate(green)	3green_1	139,2,0
-sword_1-1.gat,121,173,1	duplicate(green)	3green_2	139,2,0
-sword_1-1.gat,121,164,1	duplicate(green)	3green_3	139,2,0
-sword_1-1.gat,121,165,1	duplicate(green)	3green_4	139,2,0
-sword_1-1.gat,121,168,1	duplicate(green)	3green_5	139,2,0
-sword_1-1.gat,121,169,1	duplicate(green)	3green_6	139,2,0
+job_sword1.gat,121,172,1	duplicate(green)	3green_1	139,2,0
+job_sword1.gat,121,173,1	duplicate(green)	3green_2	139,2,0
+job_sword1.gat,121,164,1	duplicate(green)	3green_3	139,2,0
+job_sword1.gat,121,165,1	duplicate(green)	3green_4	139,2,0
+job_sword1.gat,121,168,1	duplicate(green)	3green_5	139,2,0
+job_sword1.gat,121,169,1	duplicate(green)	3green_6	139,2,0
 
 // -- Fourth Section --
-sword_1-1.gat,130,169,1	duplicate(green)	4green_1	139,0,4
-sword_1-1.gat,131,169,1	duplicate(green)	4green_2	139,0,4
-sword_1-1.gat,135,164,1	duplicate(green)	4green_3	139,5,0
-sword_1-1.gat,136,165,1	duplicate(green)	4green_4	139,4,0
-sword_1-1.gat,140,169,1	duplicate(green)	4green_5	139,0,3
-sword_1-1.gat,141,168,1	duplicate(green)	4green_6	139,0,4
-sword_1-1.gat,137,172,1	duplicate(green)	4green_7	139,2,0
-sword_1-1.gat,138,173,1	duplicate(green)	4green_8	139,3,0
-sword_1-1.gat,134,171,1	duplicate(green)	4green_9	139,0,2
-sword_1-1.gat,135,168,1	duplicate(green)	4green_10	139,0,1
-sword_1-1.gat,135,170,1	duplicate(green)	4green_11	139,1,0
+job_sword1.gat,130,169,1	duplicate(green)	4green_1	139,0,4
+job_sword1.gat,131,169,1	duplicate(green)	4green_2	139,0,4
+job_sword1.gat,135,164,1	duplicate(green)	4green_3	139,5,0
+job_sword1.gat,136,165,1	duplicate(green)	4green_4	139,4,0
+job_sword1.gat,140,169,1	duplicate(green)	4green_5	139,0,3
+job_sword1.gat,141,168,1	duplicate(green)	4green_6	139,0,4
+job_sword1.gat,137,172,1	duplicate(green)	4green_7	139,2,0
+job_sword1.gat,138,173,1	duplicate(green)	4green_8	139,3,0
+job_sword1.gat,134,171,1	duplicate(green)	4green_9	139,0,2
+job_sword1.gat,135,168,1	duplicate(green)	4green_10	139,0,1
+job_sword1.gat,135,170,1	duplicate(green)	4green_11	139,1,0
 
 // -- Fifth Section --
-sword_1-1.gat,144,169,1	duplicate(green)	5green_1	139,0,4
-sword_1-1.gat,145,169,1	duplicate(green)	5green_2	139,0,4
-sword_1-1.gat,148,164,1	duplicate(green)	5green_3	139,4,0
-sword_1-1.gat,149,165,1	duplicate(green)	5green_4	139,3,0
-sword_1-1.gat,156,166,1	duplicate(green)	5green_5	139,0,2
-sword_1-1.gat,157,166,1	duplicate(green)	5green_6	139,0,2
-sword_1-1.gat,153,169,1	duplicate(green)	5green_7	139,4,0
-sword_1-1.gat,152,168,1	duplicate(green)	5green_8	139,3,0
-sword_1-1.gat,149,171,1	duplicate(green)	5green_9	139,0,1
-sword_1-1.gat,148,171,1	duplicate(green)	5green_10	139,0,2
-sword_1-1.gat,154,173,1	duplicate(green)	5green_11	139,2,0
-sword_1-1.gat,154,172,1	duplicate(green)	5green_12	139,2,0
+job_sword1.gat,144,169,1	duplicate(green)	5green_1	139,0,4
+job_sword1.gat,145,169,1	duplicate(green)	5green_2	139,0,4
+job_sword1.gat,148,164,1	duplicate(green)	5green_3	139,4,0
+job_sword1.gat,149,165,1	duplicate(green)	5green_4	139,3,0
+job_sword1.gat,156,166,1	duplicate(green)	5green_5	139,0,2
+job_sword1.gat,157,166,1	duplicate(green)	5green_6	139,0,2
+job_sword1.gat,153,169,1	duplicate(green)	5green_7	139,4,0
+job_sword1.gat,152,168,1	duplicate(green)	5green_8	139,3,0
+job_sword1.gat,149,171,1	duplicate(green)	5green_9	139,0,1
+job_sword1.gat,148,171,1	duplicate(green)	5green_10	139,0,2
+job_sword1.gat,154,173,1	duplicate(green)	5green_11	139,2,0
+job_sword1.gat,154,172,1	duplicate(green)	5green_12	139,2,0
 
 // -- Last Section --
-sword_1-1.gat,164,172,1	duplicate(green)	6green_1	139,0,0
-sword_1-1.gat,164,173,1	duplicate(green)	6green_2	139,0,0
-sword_1-1.gat,165,172,1	duplicate(green)	6green_3	139,0,0
-sword_1-1.gat,165,173,1	duplicate(green)	6green_4	139,0,0
-sword_1-1.gat,172,172,1	duplicate(green)	6green_5	139,0,0
-sword_1-1.gat,172,173,1	duplicate(green)	6green_6	139,0,0
-sword_1-1.gat,173,172,1	duplicate(green)	6green_7	139,0,0
-sword_1-1.gat,173,173,1	duplicate(green)	6green_8	139,0,0
-
-sword_1-1.gat,164,168,1	duplicate(green)	6green_9	139,0,0
-sword_1-1.gat,164,169,1	duplicate(green)	6green_10	139,0,0
-sword_1-1.gat,165,168,1	duplicate(green)	6green_11	139,0,0
-sword_1-1.gat,165,169,1	duplicate(green)	6green_12	139,0,0
-sword_1-1.gat,172,168,1	duplicate(green)	6green_13	139,0,0
-sword_1-1.gat,172,169,1	duplicate(green)	6green_14	139,0,0
-sword_1-1.gat,173,168,1	duplicate(green)	6green_15	139,0,0
-sword_1-1.gat,173,169,1	duplicate(green)	6green_16	139,0,0
-
-sword_1-1.gat,164,164,1	duplicate(green)	6green_17	139,0,0
-sword_1-1.gat,164,165,1	duplicate(green)	6green_18	139,0,0
-sword_1-1.gat,165,164,1	duplicate(green)	6green_19	139,0,0
-sword_1-1.gat,165,165,1	duplicate(green)	6green_20	139,0,0
-sword_1-1.gat,172,164,1	duplicate(green)	6green_21	139,0,0
-sword_1-1.gat,172,165,1	duplicate(green)	6green_22	139,0,0
-sword_1-1.gat,173,164,1	duplicate(green)	6green_23	139,0,0
-sword_1-1.gat,173,165,1	duplicate(green)	6green_24	139,0,0
+job_sword1.gat,164,172,1	duplicate(green)	6green_1	139,0,0
+job_sword1.gat,164,173,1	duplicate(green)	6green_2	139,0,0
+job_sword1.gat,165,172,1	duplicate(green)	6green_3	139,0,0
+job_sword1.gat,165,173,1	duplicate(green)	6green_4	139,0,0
+job_sword1.gat,172,172,1	duplicate(green)	6green_5	139,0,0
+job_sword1.gat,172,173,1	duplicate(green)	6green_6	139,0,0
+job_sword1.gat,173,172,1	duplicate(green)	6green_7	139,0,0
+job_sword1.gat,173,173,1	duplicate(green)	6green_8	139,0,0
+
+job_sword1.gat,164,168,1	duplicate(green)	6green_9	139,0,0
+job_sword1.gat,164,169,1	duplicate(green)	6green_10	139,0,0
+job_sword1.gat,165,168,1	duplicate(green)	6green_11	139,0,0
+job_sword1.gat,165,169,1	duplicate(green)	6green_12	139,0,0
+job_sword1.gat,172,168,1	duplicate(green)	6green_13	139,0,0
+job_sword1.gat,172,169,1	duplicate(green)	6green_14	139,0,0
+job_sword1.gat,173,168,1	duplicate(green)	6green_15	139,0,0
+job_sword1.gat,173,169,1	duplicate(green)	6green_16	139,0,0
+
+job_sword1.gat,164,164,1	duplicate(green)	6green_17	139,0,0
+job_sword1.gat,164,165,1	duplicate(green)	6green_18	139,0,0
+job_sword1.gat,165,164,1	duplicate(green)	6green_19	139,0,0
+job_sword1.gat,165,165,1	duplicate(green)	6green_20	139,0,0
+job_sword1.gat,172,164,1	duplicate(green)	6green_21	139,0,0
+job_sword1.gat,172,165,1	duplicate(green)	6green_22	139,0,0
+job_sword1.gat,173,164,1	duplicate(green)	6green_23	139,0,0
+job_sword1.gat,173,165,1	duplicate(green)	6green_24	139,0,0
 
 
 
 // == Fall Warps ==
 
-sword_1-1.gat,16,251,4	script	1_blank_1a#1::1_blank	139,0,1,{
+job_sword1.gat,16,251,4	script	1_blank_1a#1::1_blank	139,0,1,{
 	set @TEMP,rand(5);
-	if (@TEMP==0) warp "sword_1-1.gat",65,56;
-	if (@TEMP==1) warp "sword_1-1.gat",29,26;
-	if (@TEMP==2) warp "sword_1-1.gat",43,16;
-	if (@TEMP==3) warp "sword_1-1.gat",23,112;
-	if (@TEMP==4) warp "sword_1-1.gat",58,83;
+	if (@TEMP==0) warp "job_sword1.gat",65,56;
+	if (@TEMP==1) warp "job_sword1.gat",29,26;
+	if (@TEMP==2) warp "job_sword1.gat",43,16;
+	if (@TEMP==3) warp "job_sword1.gat",23,112;
+	if (@TEMP==4) warp "job_sword1.gat",58,83;
 	end;
 }
 
 // -- Duplicates --
-sword_1-1.gat,19,251,4	duplicate(1_blank)	1_blank_1b	139,0,1
-sword_1-1.gat,17,250,4	duplicate(1_blank)	1_blank_1c	139,1,0
-sword_1-1.gat,17,251,4	duplicate(1_blank)	1_blank_1d	139,1,1
-sword_1-1.gat,18,251,4	duplicate(1_blank)	1_blank_1e	139,1,1
-sword_1-1.gat,17,251,4	duplicate(1_blank)	1_blank_1f	139,1,1
-sword_1-1.gat,16,238,4	duplicate(1_blank)	1_blank_2a	139,0,1
-sword_1-1.gat,19,238,4	duplicate(1_blank)	1_blank_2b	139,0,1
-sword_1-1.gat,17,239,4	duplicate(1_blank)	1_blank_2c	139,0,1
-sword_1-1.gat,28,246,4	duplicate(1_blank)	1_blank_3a	139,4,1
-sword_1-1.gat,33,245,4	duplicate(1_blank)	1_blank_3b	139,0,2
-sword_1-1.gat,29,242,4	duplicate(1_blank)	1_blank_3c	139,4,0
-sword_1-1.gat,24,244,4	duplicate(1_blank)	1_blank_3d	139,0,2
-sword_1-1.gat,38,251,4	duplicate(1_blank)	1_blank_4a	139,0,1
-sword_1-1.gat,41,251,4	duplicate(1_blank)	1_blank_4b	139,0,1
-sword_1-1.gat,39,250,4	duplicate(1_blank)	1_blank_4c	139,1,0
-sword_1-1.gat,38,238,4	duplicate(1_blank)	1_blank_5a	139,0,1
-sword_1-1.gat,41,238,4	duplicate(1_blank)	1_blank_5_b	139,0,1
-sword_1-1.gat,39,239,4	duplicate(1_blank)	1_blank_5_c	139,1,0
-sword_1-1.gat,54,251,4	duplicate(1_blank)	1_blank_6_a	139,0,1
-sword_1-1.gat,71,251,4	duplicate(1_blank)	1_blank_6_b	139,0,1
-sword_1-1.gat,62,250,4	duplicate(1_blank)	1_blank_6_c	139,9,0
-sword_1-1.gat,62,247,4	duplicate(1_blank)	1_blank_7_a	139,8,0
-sword_1-1.gat,71,244,4	duplicate(1_blank)	1_blank_7_b	139,0,2
-sword_1-1.gat,63,242,4	duplicate(1_blank)	1_blank_7_c	139,8,0
-sword_1-1.gat,54,244,4	duplicate(1_blank)	1_blank_7_d	139,0,2
-sword_1-1.gat,54,238,4	duplicate(1_blank)	1_blank_8_a	139,0,1
-sword_1-1.gat,71,238,4	duplicate(1_blank)	1_blank_8_b	139,0,1
-sword_1-1.gat,62,239,4	duplicate(1_blank)	1_blank_8_c	139,9,0
-sword_1-1.gat,102,247,4	duplicate(1_blank)	1_blank_9_a	139,2,0
-sword_1-1.gat,105,245,4	duplicate(1_blank)	1_blank_9_b	139,0,2
-sword_1-1.gat,103,242,4	duplicate(1_blank)	1_blank_9_c	139,2,0
-sword_1-1.gat,100,244,4	duplicate(1_blank)	1_blank_9_d	139,0,2
-sword_1-1.gat,156,249,4	duplicate(1_blank)	1_blank_10_a	139,14,0
-sword_1-1.gat,156,248,4	duplicate(1_blank)	1_blank_10_b	139,14,0
-sword_1-1.gat,170,249,4	duplicate(1_blank)	1_blank_10_c	139,1,0
-sword_1-1.gat,170,248,4	duplicate(1_blank)	1_blank_10_d	139,1,0
-sword_1-1.gat,156,245,4	duplicate(1_blank)	1_blank_11_a	139,14,0
-sword_1-1.gat,156,244,4	duplicate(1_blank)	1_blank_11_b	139,14,0
-sword_1-1.gat,170,245,4	duplicate(1_blank)	1_blank_11_c	139,1,0
-sword_1-1.gat,170,244,4	duplicate(1_blank)	1_blank_11_d	139,1,0
-sword_1-1.gat,156,241,4	duplicate(1_blank)	1_blank_12_a	139,14,0
-sword_1-1.gat,156,240,4	duplicate(1_blank)	1_blank_12_b	139,14,0
-sword_1-1.gat,170,241,4	duplicate(1_blank)	1_blank_12_c	139,1,0
-sword_1-1.gat,170,240,4	duplicate(1_blank)	1_blank_12_d	139,1,0
-sword_1-1.gat,180,251,4	duplicate(1_blank)	1_blank_13_a	139,0,1
-sword_1-1.gat,183,251,4	duplicate(1_blank)	1_blank_13_b	139,0,1
-sword_1-1.gat,181,250,4	duplicate(1_blank)	1_blank_13_c	139,1,0
-sword_1-1.gat,180,238,4	duplicate(1_blank)	1_blank_14_a	139,0,1
-sword_1-1.gat,183,238,4	duplicate(1_blank)	1_blank_14_b	139,0,1
-sword_1-1.gat,181,239,4	duplicate(1_blank)	1_blank_14_c	139,1,0
-
-
-sword_1-1.gat,56,212,4	script	2_blank_1_a::2_blank	139,40,0,{
+job_sword1.gat,19,251,4	duplicate(1_blank)	1_blank_1b	139,0,1
+job_sword1.gat,17,250,4	duplicate(1_blank)	1_blank_1c	139,1,0
+job_sword1.gat,17,251,4	duplicate(1_blank)	1_blank_1d	139,1,1
+job_sword1.gat,18,251,4	duplicate(1_blank)	1_blank_1e	139,1,1
+job_sword1.gat,17,251,4	duplicate(1_blank)	1_blank_1f	139,1,1
+job_sword1.gat,16,238,4	duplicate(1_blank)	1_blank_2a	139,0,1
+job_sword1.gat,19,238,4	duplicate(1_blank)	1_blank_2b	139,0,1
+job_sword1.gat,17,239,4	duplicate(1_blank)	1_blank_2c	139,0,1
+job_sword1.gat,28,246,4	duplicate(1_blank)	1_blank_3a	139,4,1
+job_sword1.gat,33,245,4	duplicate(1_blank)	1_blank_3b	139,0,2
+job_sword1.gat,29,242,4	duplicate(1_blank)	1_blank_3c	139,4,0
+job_sword1.gat,24,244,4	duplicate(1_blank)	1_blank_3d	139,0,2
+job_sword1.gat,38,251,4	duplicate(1_blank)	1_blank_4a	139,0,1
+job_sword1.gat,41,251,4	duplicate(1_blank)	1_blank_4b	139,0,1
+job_sword1.gat,39,250,4	duplicate(1_blank)	1_blank_4c	139,1,0
+job_sword1.gat,38,238,4	duplicate(1_blank)	1_blank_5a	139,0,1
+job_sword1.gat,41,238,4	duplicate(1_blank)	1_blank_5_b	139,0,1
+job_sword1.gat,39,239,4	duplicate(1_blank)	1_blank_5_c	139,1,0
+job_sword1.gat,54,251,4	duplicate(1_blank)	1_blank_6_a	139,0,1
+job_sword1.gat,71,251,4	duplicate(1_blank)	1_blank_6_b	139,0,1
+job_sword1.gat,62,250,4	duplicate(1_blank)	1_blank_6_c	139,9,0
+job_sword1.gat,62,247,4	duplicate(1_blank)	1_blank_7_a	139,8,0
+job_sword1.gat,71,244,4	duplicate(1_blank)	1_blank_7_b	139,0,2
+job_sword1.gat,63,242,4	duplicate(1_blank)	1_blank_7_c	139,8,0
+job_sword1.gat,54,244,4	duplicate(1_blank)	1_blank_7_d	139,0,2
+job_sword1.gat,54,238,4	duplicate(1_blank)	1_blank_8_a	139,0,1
+job_sword1.gat,71,238,4	duplicate(1_blank)	1_blank_8_b	139,0,1
+job_sword1.gat,62,239,4	duplicate(1_blank)	1_blank_8_c	139,9,0
+job_sword1.gat,102,247,4	duplicate(1_blank)	1_blank_9_a	139,2,0
+job_sword1.gat,105,245,4	duplicate(1_blank)	1_blank_9_b	139,0,2
+job_sword1.gat,103,242,4	duplicate(1_blank)	1_blank_9_c	139,2,0
+job_sword1.gat,100,244,4	duplicate(1_blank)	1_blank_9_d	139,0,2
+job_sword1.gat,156,249,4	duplicate(1_blank)	1_blank_10_a	139,14,0
+job_sword1.gat,156,248,4	duplicate(1_blank)	1_blank_10_b	139,14,0
+job_sword1.gat,170,249,4	duplicate(1_blank)	1_blank_10_c	139,1,0
+job_sword1.gat,170,248,4	duplicate(1_blank)	1_blank_10_d	139,1,0
+job_sword1.gat,156,245,4	duplicate(1_blank)	1_blank_11_a	139,14,0
+job_sword1.gat,156,244,4	duplicate(1_blank)	1_blank_11_b	139,14,0
+job_sword1.gat,170,245,4	duplicate(1_blank)	1_blank_11_c	139,1,0
+job_sword1.gat,170,244,4	duplicate(1_blank)	1_blank_11_d	139,1,0
+job_sword1.gat,156,241,4	duplicate(1_blank)	1_blank_12_a	139,14,0
+job_sword1.gat,156,240,4	duplicate(1_blank)	1_blank_12_b	139,14,0
+job_sword1.gat,170,241,4	duplicate(1_blank)	1_blank_12_c	139,1,0
+job_sword1.gat,170,240,4	duplicate(1_blank)	1_blank_12_d	139,1,0
+job_sword1.gat,180,251,4	duplicate(1_blank)	1_blank_13_a	139,0,1
+job_sword1.gat,183,251,4	duplicate(1_blank)	1_blank_13_b	139,0,1
+job_sword1.gat,181,250,4	duplicate(1_blank)	1_blank_13_c	139,1,0
+job_sword1.gat,180,238,4	duplicate(1_blank)	1_blank_14_a	139,0,1
+job_sword1.gat,183,238,4	duplicate(1_blank)	1_blank_14_b	139,0,1
+job_sword1.gat,181,239,4	duplicate(1_blank)	1_blank_14_c	139,1,0
+
+
+job_sword1.gat,56,212,4	script	2_blank_1_a::2_blank	139,40,0,{
 	set @TEMP,rand(5);
-	if (@TEMP==0) warp "sword_1-1.gat",162,120;
-	if (@TEMP==1) warp "sword_1-1.gat",94,120;
-	if (@TEMP==2) warp "sword_1-1.gat",94,85;
-	if (@TEMP==3) warp "sword_1-1.gat",162,85;
-	if (@TEMP==4) warp "sword_1-1.gat",130,47;
+	if (@TEMP==0) warp "job_sword1.gat",162,120;
+	if (@TEMP==1) warp "job_sword1.gat",94,120;
+	if (@TEMP==2) warp "job_sword1.gat",94,85;
+	if (@TEMP==3) warp "job_sword1.gat",162,85;
+	if (@TEMP==4) warp "job_sword1.gat",130,47;
 	end;
 }
 
 // -- Duplicates --
-sword_1-1.gat,95,212,4	duplicate(2_blank)	2_blank_1_b	139,2,0
-sword_1-1.gat,56,210,4	duplicate(2_blank)	2_blank_2_a	139,40,0
-sword_1-1.gat,95,210,4	duplicate(2_blank)	2_blank_2_b	139,2,0
-sword_1-1.gat,16,206,4	duplicate(2_blank)	2_blank_2_c	139,0,3
-sword_1-1.gat,97,206,4	duplicate(2_blank)	2_blank_2_d	139,0,3
-sword_1-1.gat,56,203,4	duplicate(2_blank)	2_blank_2_e	139,40,0
-sword_1-1.gat,95,203,4	duplicate(2_blank)	2_blank_2_f	139,2,0
-sword_1-1.gat,56,201,4	duplicate(2_blank)	2_blank_3_a	139,40,0
-sword_1-1.gat,95,201,4	duplicate(2_blank)	2_blank_3_b	139,2,0
+job_sword1.gat,95,212,4	duplicate(2_blank)	2_blank_1_b	139,2,0
+job_sword1.gat,56,210,4	duplicate(2_blank)	2_blank_2_a	139,40,0
+job_sword1.gat,95,210,4	duplicate(2_blank)	2_blank_2_b	139,2,0
+job_sword1.gat,16,206,4	duplicate(2_blank)	2_blank_2_c	139,0,3
+job_sword1.gat,97,206,4	duplicate(2_blank)	2_blank_2_d	139,0,3
+job_sword1.gat,56,203,4	duplicate(2_blank)	2_blank_2_e	139,40,0
+job_sword1.gat,95,203,4	duplicate(2_blank)	2_blank_2_f	139,2,0
+job_sword1.gat,56,201,4	duplicate(2_blank)	2_blank_3_a	139,40,0
+job_sword1.gat,95,201,4	duplicate(2_blank)	2_blank_3_b	139,2,0
 
 // - part 2 -
-sword_1-1.gat,113,212,4	duplicate(2_blank)	2_blank_4_a	139,14,0
-sword_1-1.gat,125,212,4	duplicate(2_blank)	2_blank_4_b	139,2,0
-sword_1-1.gat,113,210,4	duplicate(2_blank)	2_blank_5_a	139,14,0
-sword_1-1.gat,125,210,4	duplicate(2_blank)	2_blank_5_b	139,2,0
-sword_1-1.gat,100,206,4	duplicate(2_blank)	2_blank_5_c	139,0,3
-sword_1-1.gat,127,206,4	duplicate(2_blank)	2_blank_5_d	139,0,3
-sword_1-1.gat,113,203,4	duplicate(2_blank)	2_blank_5_e	139,14,0
-sword_1-1.gat,125,210,4	duplicate(2_blank)	2_blank_5_f	139,2,0
-sword_1-1.gat,113,201,4	duplicate(2_blank)	2_blank_6_a	139,14,0
-sword_1-1.gat,113,201,4	duplicate(2_blank)	2_blank_6_b	139,2,0
+job_sword1.gat,113,212,4	duplicate(2_blank)	2_blank_4_a	139,14,0
+job_sword1.gat,125,212,4	duplicate(2_blank)	2_blank_4_b	139,2,0
+job_sword1.gat,113,210,4	duplicate(2_blank)	2_blank_5_a	139,14,0
+job_sword1.gat,125,210,4	duplicate(2_blank)	2_blank_5_b	139,2,0
+job_sword1.gat,100,206,4	duplicate(2_blank)	2_blank_5_c	139,0,3
+job_sword1.gat,127,206,4	duplicate(2_blank)	2_blank_5_d	139,0,3
+job_sword1.gat,113,203,4	duplicate(2_blank)	2_blank_5_e	139,14,0
+job_sword1.gat,125,210,4	duplicate(2_blank)	2_blank_5_f	139,2,0
+job_sword1.gat,113,201,4	duplicate(2_blank)	2_blank_6_a	139,14,0
+job_sword1.gat,113,201,4	duplicate(2_blank)	2_blank_6_b	139,2,0
 
 // - part 3 -
-sword_1-1.gat,155,212,4	duplicate(2_blank)	2_blank_7_a	139,21,0
-sword_1-1.gat,181,212,4	duplicate(2_blank)	2_blank_7_b	139,2,0
-sword_1-1.gat,155,210,4	duplicate(2_blank)	2_blank_8_a	139,21,0
-sword_1-1.gat,181,210,4	duplicate(2_blank)	2_blank_8_b	139,2,0
-sword_1-1.gat,130,206,4	duplicate(2_blank)	2_blank_8_c	139,0,3
-sword_1-1.gat,183,206,4	duplicate(2_blank)	2_blank_8_d	139,0,3
-sword_1-1.gat,155,203,4	duplicate(2_blank)	2_blank_8_e	139,21,0
-sword_1-1.gat,181,203,4	duplicate(2_blank)	2_blank_8_f	139,2,0
-sword_1-1.gat,155,201,4	duplicate(2_blank)	2_blank_9_a	139,40,0
-sword_1-1.gat,181,201,4	duplicate(2_blank)	2_blank_9_b	139,2,0
-
-sword_1-1.gat,17,174,4	script	3_blank_1_a::3_blank	139,2,0,{
+job_sword1.gat,155,212,4	duplicate(2_blank)	2_blank_7_a	139,21,0
+job_sword1.gat,181,212,4	duplicate(2_blank)	2_blank_7_b	139,2,0
+job_sword1.gat,155,210,4	duplicate(2_blank)	2_blank_8_a	139,21,0
+job_sword1.gat,181,210,4	duplicate(2_blank)	2_blank_8_b	139,2,0
+job_sword1.gat,130,206,4	duplicate(2_blank)	2_blank_8_c	139,0,3
+job_sword1.gat,183,206,4	duplicate(2_blank)	2_blank_8_d	139,0,3
+job_sword1.gat,155,203,4	duplicate(2_blank)	2_blank_8_e	139,21,0
+job_sword1.gat,181,203,4	duplicate(2_blank)	2_blank_8_f	139,2,0
+job_sword1.gat,155,201,4	duplicate(2_blank)	2_blank_9_a	139,40,0
+job_sword1.gat,181,201,4	duplicate(2_blank)	2_blank_9_b	139,2,0
+
+job_sword1.gat,17,174,4	script	3_blank_1_a::3_blank	139,2,0,{
 	set @TEMP,rand(5);
-	if (@TEMP==0) warp "sword_1-1.gat",195,15;
-	if (@TEMP==1) warp "sword_1-1.gat",195,38;
-	if (@TEMP==2) warp "sword_1-1.gat",231,30;
-	if (@TEMP==3) warp "sword_1-1.gat",198,65;
-	if (@TEMP==4) warp "sword_1-1.gat",196,116;
+	if (@TEMP==0) warp "job_sword1.gat",195,15;
+	if (@TEMP==1) warp "job_sword1.gat",195,38;
+	if (@TEMP==2) warp "job_sword1.gat",231,30;
+	if (@TEMP==3) warp "job_sword1.gat",198,65;
+	if (@TEMP==4) warp "job_sword1.gat",196,116;
 	end;
 }
 
 // -- Duplicates --
-sword_1-1.gat,17,163,4	duplicate(3_blank)	3_blank_2_a	139,2,0
-sword_1-1.gat,29,171,4	duplicate(3_blank)	3_blank_3_a	139,2,0
-sword_1-1.gat,31,168,4	duplicate(3_blank)	3_blank_3_b	139,0,2
-sword_1-1.gat,28,166,4	duplicate(3_blank)	3_blank_3_c	139,2,0
-sword_1-1.gat,26,168,4	duplicate(3_blank)	3_blank_3_d	139,0,2
-sword_1-1.gat,36,169,4	duplicate(3_blank)	3_blank_4_a	139,0,0
-sword_1-1.gat,37,169,4	duplicate(3_blank)	3_blank_4_b	139,0,0
-sword_1-1.gat,37,168,4	duplicate(3_blank)	3_blank_4_c	139,0,0
-sword_1-1.gat,36,168,4	duplicate(3_blank)	3_blank_4_d	139,0,0
-sword_1-1.gat,40,175,4	duplicate(3_blank)	3_blank_5_a	139,0,1
-sword_1-1.gat,41,175,4	duplicate(3_blank)	3_blank_5_b	139,0,1
-sword_1-1.gat,41,171,4	duplicate(3_blank)	3_blank_6_a	139,1,0
-sword_1-1.gat,41,170,4	duplicate(3_blank)	3_blank_6_b	139,1,0
-sword_1-1.gat,41,167,4	duplicate(3_blank)	3_blank_6_c	139,1,0
-sword_1-1.gat,41,166,4	duplicate(3_blank)	3_blank_6_d	139,1,0
-sword_1-1.gat,42,169,4	duplicate(3_blank)	3_blank_6_e	139,0,1
-sword_1-1.gat,43,170,4	duplicate(3_blank)	3_blank_6_f	139,0,1
-sword_1-1.gat,43,167,4	duplicate(3_blank)	3_blank_6_g	139,0,1
-sword_1-1.gat,40,162,4	duplicate(3_blank)	3_blank_7_a	139,0,1
-sword_1-1.gat,41,162,4	duplicate(3_blank)	3_blank_7_b	139,0,1
-sword_1-1.gat,46,175,4	duplicate(3_blank)	3_blank_8_a	139,0,1
-sword_1-1.gat,51,175,4	duplicate(3_blank)	3_blank_8_b	139,0,1
-sword_1-1.gat,47,174,4	duplicate(3_blank)	3_blank_8_c	139,1,0
-sword_1-1.gat,50,174,4	duplicate(3_blank)	3_blank_8_d	139,1,0
-sword_1-1.gat,48,173,4	duplicate(3_blank)	3_blank_8_e	139,0,1
-sword_1-1.gat,49,173,4	duplicate(3_blank)	3_blank_8_f	139,0,1
-sword_1-1.gat,46,162,4	duplicate(3_blank)	3_blank_9_a	139,0,1
-sword_1-1.gat,51,162,4	duplicate(3_blank)	3_blank_9_b	139,0,1
-sword_1-1.gat,47,163,4	duplicate(3_blank)	3_blank_9_c	139,1,0
-sword_1-1.gat,50,163,4	duplicate(3_blank)	3_blank_9_d	139,1,0
-sword_1-1.gat,48,164,4	duplicate(3_blank)	3_blank_9_e	139,0,1
-sword_1-1.gat,49,164,4	duplicate(3_blank)	3_blank_9_f	139,0,1
-sword_1-1.gat,54,170,4	duplicate(3_blank)	3_blank_10_a	139,0,1
-sword_1-1.gat,55,170,4	duplicate(3_blank)	3_blank_10_b	139,0,1
-sword_1-1.gat,54,167,4	duplicate(3_blank)	3_blank_10_c	139,0,1
-sword_1-1.gat,55,167,4	duplicate(3_blank)	3_blank_10_d	139,0,1
-sword_1-1.gat,53,169,4	duplicate(3_blank)	3_blank_10_e	139,1,0
-sword_1-1.gat,53,168,4	duplicate(3_blank)	3_blank_10_f	139,1,0
-sword_1-1.gat,56,169,4	duplicate(3_blank)	3_blank_10_g	139,1,0
-sword_1-1.gat,56,168,4	duplicate(3_blank)	3_blank_10_h	139,1,0
-sword_1-1.gat,58,175,4	duplicate(3_blank)	3_blank_11_a	139,0,1
-sword_1-1.gat,59,174,4	duplicate(3_blank)	3_blank_11_b	139,1,0
-sword_1-1.gat,60,173,4	duplicate(3_blank)	3_blank_11_c	139,0,1
-sword_1-1.gat,61,172,4	duplicate(3_blank)	3_blank_11_d	139,1,0
-sword_1-1.gat,58,162,4	duplicate(3_blank)	3_blank_12_a	139,0,1
-sword_1-1.gat,59,163,4	duplicate(3_blank)	3_blank_12_b	139,1,0
-sword_1-1.gat,60,164,4	duplicate(3_blank)	3_blank_12_c	139,0,1
-sword_1-1.gat,61,165,4	duplicate(3_blank)	3_blank_12_d	139,1,0
-sword_1-1.gat,76,172,4	duplicate(3_blank)	3_blank_13_a	139,1,0
-sword_1-1.gat,77,173,4	duplicate(3_blank)	3_blank_13_b	139,0,1
-sword_1-1.gat,78,174,4	duplicate(3_blank)	3_blank_13_c	139,1,0
-sword_1-1.gat,79,175,4	duplicate(3_blank)	3_blank_13_d	139,0,1
-sword_1-1.gat,76,165,4	duplicate(3_blank)	3_blank_14_a	139,1,0
-sword_1-1.gat,77,164,4	duplicate(3_blank)	3_blank_14_b	139,0,1
-sword_1-1.gat,78,163,4	duplicate(3_blank)	3_blank_14_c	139,1,0
-sword_1-1.gat,79,162,4	duplicate(3_blank)	3_blank_14_d	139,0,1
-sword_1-1.gat,94,175,4	duplicate(3_blank)	3_blank_15_a	139,0,1
-sword_1-1.gat,95,174,4	duplicate(3_blank)	3_blank_15_b	139,1,0
-sword_1-1.gat,98,174,4	duplicate(3_blank)	3_blank_15_c	139,1,0
-sword_1-1.gat,99,175,4	duplicate(3_blank)	3_blank_16_d	139,0,1
-sword_1-1.gat,96,169,4	duplicate(3_blank)	3_blank_17_a	139,0,0
-sword_1-1.gat,97,169,4	duplicate(3_blank)	3_blank_17_b	139,0,0
-sword_1-1.gat,97,168,4	duplicate(3_blank)	3_blank_17_c	139,0,0
-sword_1-1.gat,96,168,4	duplicate(3_blank)	3_blank_17_d	139,0,0
-sword_1-1.gat,94,162,4	duplicate(3_blank)	3_blank_18_a	139,0,1
-sword_1-1.gat,95,163,4	duplicate(3_blank)	3_blank_18_b	139,1,0
-sword_1-1.gat,98,163,4	duplicate(3_blank)	3_blank_18_c	139,1,0
-sword_1-1.gat,99,162,4	duplicate(3_blank)	3_blank_18_d	139,0,1
-sword_1-1.gat,114,175,4	duplicate(3_blank)	3_blank_19_a	139,0,1
-sword_1-1.gat,115,175,4	duplicate(3_blank)	3_blank_19_b	139,0,1
-sword_1-1.gat,114,162,4	duplicate(3_blank)	3_blank_20_a	139,0,1
-sword_1-1.gat,115,162,4	duplicate(3_blank)	3_blank_20_b	139,0,1
-sword_1-1.gat,126,175,4	duplicate(3_blank)	3_blank_21_a	139,0,1
-sword_1-1.gat,127,175,4	duplicate(3_blank)	3_blank_21_b	139,0,1
-sword_1-1.gat,126,162,4	duplicate(3_blank)	3_blank_23_a	139,0,1
-sword_1-1.gat,127,162,4	duplicate(3_blank)	3_blank_23_b	139,0,1
-sword_1-1.gat,160,174,4	duplicate(3_blank)	3_blank_24_a	139,0,2
-sword_1-1.gat,161,174,4	duplicate(3_blank)	3_blank_24_b	139,0,2
-sword_1-1.gat,160,163,4	duplicate(3_blank)	3_blank_25_a	139,0,2
-sword_1-1.gat,161,163,4	duplicate(3_blank)	3_blank_25_b	139,0,2
-sword_1-1.gat,168,175,4	duplicate(3_blank)	3_blank_26_a	139,0,2
-sword_1-1.gat,169,175,4	duplicate(3_blank)	3_blank_26_b	139,0,2
-sword_1-1.gat,168,162,4	duplicate(3_blank)	3_blank_27_a	139,0,2
-sword_1-1.gat,169,162,4	duplicate(3_blank)	3_blank_27_b	139,0,2
-sword_1-1.gat,176,174,4	duplicate(3_blank)	3_blank_28_a	139,0,2
-sword_1-1.gat,177,174,4	duplicate(3_blank)	3_blank_28_b	139,0,2
-sword_1-1.gat,178,173,4	duplicate(3_blank)	3_blank_28_c	139,1,0
-sword_1-1.gat,178,172,4	duplicate(3_blank)	3_blank_28_d	139,1,0
-sword_1-1.gat,181,174,4	duplicate(3_blank)	3_blank_28_e	139,2,0
-sword_1-1.gat,179,169,4	duplicate(3_blank)	3_blank_29_a	139,3,0
-sword_1-1.gat,179,168,4	duplicate(3_blank)	3_blank_29_b	139,3,0
-sword_1-1.gat,182,169,4	duplicate(3_blank)	3_blank_29_c	139,0,2
-sword_1-1.gat,183,169,4	duplicate(3_blank)	3_blank_29_d	139,0,2
-sword_1-1.gat,181,167,4	duplicate(3_blank)	3_blank_29_e	139,1,0
-sword_1-1.gat,181,166,4	duplicate(3_blank)	3_blank_29_f	139,1,0
-sword_1-1.gat,183,167,4	duplicate(3_blank)	3_blank_29_g	139,0,1
-sword_1-1.gat,176,163,4	duplicate(3_blank)	3_blank_30_a	139,0,2
-sword_1-1.gat,177,163,4	duplicate(3_blank)	3_blank_30_b	139,0,2
-sword_1-1.gat,181,163,4	duplicate(3_blank)	3_blank_30_c	139,2,0
+job_sword1.gat,17,163,4	duplicate(3_blank)	3_blank_2_a	139,2,0
+job_sword1.gat,29,171,4	duplicate(3_blank)	3_blank_3_a	139,2,0
+job_sword1.gat,31,168,4	duplicate(3_blank)	3_blank_3_b	139,0,2
+job_sword1.gat,28,166,4	duplicate(3_blank)	3_blank_3_c	139,2,0
+job_sword1.gat,26,168,4	duplicate(3_blank)	3_blank_3_d	139,0,2
+job_sword1.gat,36,169,4	duplicate(3_blank)	3_blank_4_a	139,0,0
+job_sword1.gat,37,169,4	duplicate(3_blank)	3_blank_4_b	139,0,0
+job_sword1.gat,37,168,4	duplicate(3_blank)	3_blank_4_c	139,0,0
+job_sword1.gat,36,168,4	duplicate(3_blank)	3_blank_4_d	139,0,0
+job_sword1.gat,40,175,4	duplicate(3_blank)	3_blank_5_a	139,0,1
+job_sword1.gat,41,175,4	duplicate(3_blank)	3_blank_5_b	139,0,1
+job_sword1.gat,41,171,4	duplicate(3_blank)	3_blank_6_a	139,1,0
+job_sword1.gat,41,170,4	duplicate(3_blank)	3_blank_6_b	139,1,0
+job_sword1.gat,41,167,4	duplicate(3_blank)	3_blank_6_c	139,1,0
+job_sword1.gat,41,166,4	duplicate(3_blank)	3_blank_6_d	139,1,0
+job_sword1.gat,42,169,4	duplicate(3_blank)	3_blank_6_e	139,0,1
+job_sword1.gat,43,170,4	duplicate(3_blank)	3_blank_6_f	139,0,1
+job_sword1.gat,43,167,4	duplicate(3_blank)	3_blank_6_g	139,0,1
+job_sword1.gat,40,162,4	duplicate(3_blank)	3_blank_7_a	139,0,1
+job_sword1.gat,41,162,4	duplicate(3_blank)	3_blank_7_b	139,0,1
+job_sword1.gat,46,175,4	duplicate(3_blank)	3_blank_8_a	139,0,1
+job_sword1.gat,51,175,4	duplicate(3_blank)	3_blank_8_b	139,0,1
+job_sword1.gat,47,174,4	duplicate(3_blank)	3_blank_8_c	139,1,0
+job_sword1.gat,50,174,4	duplicate(3_blank)	3_blank_8_d	139,1,0
+job_sword1.gat,48,173,4	duplicate(3_blank)	3_blank_8_e	139,0,1
+job_sword1.gat,49,173,4	duplicate(3_blank)	3_blank_8_f	139,0,1
+job_sword1.gat,46,162,4	duplicate(3_blank)	3_blank_9_a	139,0,1
+job_sword1.gat,51,162,4	duplicate(3_blank)	3_blank_9_b	139,0,1
+job_sword1.gat,47,163,4	duplicate(3_blank)	3_blank_9_c	139,1,0
+job_sword1.gat,50,163,4	duplicate(3_blank)	3_blank_9_d	139,1,0
+job_sword1.gat,48,164,4	duplicate(3_blank)	3_blank_9_e	139,0,1
+job_sword1.gat,49,164,4	duplicate(3_blank)	3_blank_9_f	139,0,1
+job_sword1.gat,54,170,4	duplicate(3_blank)	3_blank_10_a	139,0,1
+job_sword1.gat,55,170,4	duplicate(3_blank)	3_blank_10_b	139,0,1
+job_sword1.gat,54,167,4	duplicate(3_blank)	3_blank_10_c	139,0,1
+job_sword1.gat,55,167,4	duplicate(3_blank)	3_blank_10_d	139,0,1
+job_sword1.gat,53,169,4	duplicate(3_blank)	3_blank_10_e	139,1,0
+job_sword1.gat,53,168,4	duplicate(3_blank)	3_blank_10_f	139,1,0
+job_sword1.gat,56,169,4	duplicate(3_blank)	3_blank_10_g	139,1,0
+job_sword1.gat,56,168,4	duplicate(3_blank)	3_blank_10_h	139,1,0
+job_sword1.gat,58,175,4	duplicate(3_blank)	3_blank_11_a	139,0,1
+job_sword1.gat,59,174,4	duplicate(3_blank)	3_blank_11_b	139,1,0
+job_sword1.gat,60,173,4	duplicate(3_blank)	3_blank_11_c	139,0,1
+job_sword1.gat,61,172,4	duplicate(3_blank)	3_blank_11_d	139,1,0
+job_sword1.gat,58,162,4	duplicate(3_blank)	3_blank_12_a	139,0,1
+job_sword1.gat,59,163,4	duplicate(3_blank)	3_blank_12_b	139,1,0
+job_sword1.gat,60,164,4	duplicate(3_blank)	3_blank_12_c	139,0,1
+job_sword1.gat,61,165,4	duplicate(3_blank)	3_blank_12_d	139,1,0
+job_sword1.gat,76,172,4	duplicate(3_blank)	3_blank_13_a	139,1,0
+job_sword1.gat,77,173,4	duplicate(3_blank)	3_blank_13_b	139,0,1
+job_sword1.gat,78,174,4	duplicate(3_blank)	3_blank_13_c	139,1,0
+job_sword1.gat,79,175,4	duplicate(3_blank)	3_blank_13_d	139,0,1
+job_sword1.gat,76,165,4	duplicate(3_blank)	3_blank_14_a	139,1,0
+job_sword1.gat,77,164,4	duplicate(3_blank)	3_blank_14_b	139,0,1
+job_sword1.gat,78,163,4	duplicate(3_blank)	3_blank_14_c	139,1,0
+job_sword1.gat,79,162,4	duplicate(3_blank)	3_blank_14_d	139,0,1
+job_sword1.gat,94,175,4	duplicate(3_blank)	3_blank_15_a	139,0,1
+job_sword1.gat,95,174,4	duplicate(3_blank)	3_blank_15_b	139,1,0
+job_sword1.gat,98,174,4	duplicate(3_blank)	3_blank_15_c	139,1,0
+job_sword1.gat,99,175,4	duplicate(3_blank)	3_blank_16_d	139,0,1
+job_sword1.gat,96,169,4	duplicate(3_blank)	3_blank_17_a	139,0,0
+job_sword1.gat,97,169,4	duplicate(3_blank)	3_blank_17_b	139,0,0
+job_sword1.gat,97,168,4	duplicate(3_blank)	3_blank_17_c	139,0,0
+job_sword1.gat,96,168,4	duplicate(3_blank)	3_blank_17_d	139,0,0
+job_sword1.gat,94,162,4	duplicate(3_blank)	3_blank_18_a	139,0,1
+job_sword1.gat,95,163,4	duplicate(3_blank)	3_blank_18_b	139,1,0
+job_sword1.gat,98,163,4	duplicate(3_blank)	3_blank_18_c	139,1,0
+job_sword1.gat,99,162,4	duplicate(3_blank)	3_blank_18_d	139,0,1
+job_sword1.gat,114,175,4	duplicate(3_blank)	3_blank_19_a	139,0,1
+job_sword1.gat,115,175,4	duplicate(3_blank)	3_blank_19_b	139,0,1
+job_sword1.gat,114,162,4	duplicate(3_blank)	3_blank_20_a	139,0,1
+job_sword1.gat,115,162,4	duplicate(3_blank)	3_blank_20_b	139,0,1
+job_sword1.gat,126,175,4	duplicate(3_blank)	3_blank_21_a	139,0,1
+job_sword1.gat,127,175,4	duplicate(3_blank)	3_blank_21_b	139,0,1
+job_sword1.gat,126,162,4	duplicate(3_blank)	3_blank_23_a	139,0,1
+job_sword1.gat,127,162,4	duplicate(3_blank)	3_blank_23_b	139,0,1
+job_sword1.gat,160,174,4	duplicate(3_blank)	3_blank_24_a	139,0,2
+job_sword1.gat,161,174,4	duplicate(3_blank)	3_blank_24_b	139,0,2
+job_sword1.gat,160,163,4	duplicate(3_blank)	3_blank_25_a	139,0,2
+job_sword1.gat,161,163,4	duplicate(3_blank)	3_blank_25_b	139,0,2
+job_sword1.gat,168,175,4	duplicate(3_blank)	3_blank_26_a	139,0,2
+job_sword1.gat,169,175,4	duplicate(3_blank)	3_blank_26_b	139,0,2
+job_sword1.gat,168,162,4	duplicate(3_blank)	3_blank_27_a	139,0,2
+job_sword1.gat,169,162,4	duplicate(3_blank)	3_blank_27_b	139,0,2
+job_sword1.gat,176,174,4	duplicate(3_blank)	3_blank_28_a	139,0,2
+job_sword1.gat,177,174,4	duplicate(3_blank)	3_blank_28_b	139,0,2
+job_sword1.gat,178,173,4	duplicate(3_blank)	3_blank_28_c	139,1,0
+job_sword1.gat,178,172,4	duplicate(3_blank)	3_blank_28_d	139,1,0
+job_sword1.gat,181,174,4	duplicate(3_blank)	3_blank_28_e	139,2,0
+job_sword1.gat,179,169,4	duplicate(3_blank)	3_blank_29_a	139,3,0
+job_sword1.gat,179,168,4	duplicate(3_blank)	3_blank_29_b	139,3,0
+job_sword1.gat,182,169,4	duplicate(3_blank)	3_blank_29_c	139,0,2
+job_sword1.gat,183,169,4	duplicate(3_blank)	3_blank_29_d	139,0,2
+job_sword1.gat,181,167,4	duplicate(3_blank)	3_blank_29_e	139,1,0
+job_sword1.gat,181,166,4	duplicate(3_blank)	3_blank_29_f	139,1,0
+job_sword1.gat,183,167,4	duplicate(3_blank)	3_blank_29_g	139,0,1
+job_sword1.gat,176,163,4	duplicate(3_blank)	3_blank_30_a	139,0,2
+job_sword1.gat,177,163,4	duplicate(3_blank)	3_blank_30_b	139,0,2
+job_sword1.gat,181,163,4	duplicate(3_blank)	3_blank_30_c	139,2,0
 
 // == Monsters ==
 //Spawn is included in this file so make shure its not elsewhere to!
-sword_1-1.gat,35,78,0,0	monster	Fabre	1184,4,0,0,0
-sword_1-1.gat,50,108,0,0	monster	Fabre	1184,2,0,0,0
-sword_1-1.gat,61,28,0,0	monster	Fabre	1184,4,0,0,0
-sword_1-1.gat,61,92,0,0	monster	Fabre	1184,2,0,0,0
+job_sword1.gat,35,78,0,0	monster	Fabre	1184,4,0,0,0
+job_sword1.gat,50,108,0,0	monster	Fabre	1184,2,0,0,0
+job_sword1.gat,61,28,0,0	monster	Fabre	1184,4,0,0,0
+job_sword1.gat,61,92,0,0	monster	Fabre	1184,2,0,0,0
 //
-sword_1-1.gat,110,112,0,0	monster	Fabre	1184,3,0,0,0
-sword_1-1.gat,161,94,0,0	monster	Fabre	1184,2,0,0,0
-sword_1-1.gat,130,76,0,0	monster	Fabre	1184,2,0,0,0
-sword_1-1.gat,103,58,0,0	monster	Fabre	1184,2,0,0,0
-sword_1-1.gat,130,24,0,0	monster	Fabre	1184,3,0,0,0
+job_sword1.gat,110,112,0,0	monster	Fabre	1184,3,0,0,0
+job_sword1.gat,161,94,0,0	monster	Fabre	1184,2,0,0,0
+job_sword1.gat,130,76,0,0	monster	Fabre	1184,2,0,0,0
+job_sword1.gat,103,58,0,0	monster	Fabre	1184,2,0,0,0
+job_sword1.gat,130,24,0,0	monster	Fabre	1184,3,0,0,0
 //
-sword_1-1.gat,201,36,0,0	monster	Fabre	1184,2,0,0,0
-sword_1-1.gat,201,16,0,0	monster	Fabre	1184,2,0,0,0
-sword_1-1.gat,239,44,0,0	monster	Fabre	1184,2,0,0,0
-sword_1-1.gat,239,76,0,0	monster	Fabre	1184,2,0,0,0
-sword_1-1.gat,231,101,0,0	monster	Fabre	1184,2,0,0,0
-sword_1-1.gat,234,117,0,0	monster	Fabre	1184,2,0,0,0
-sword_1-1.gat,198,91,0,0	monster	Fabre	1184,2,0,0,0
-sword_1-1.gat,200,63,0,0	monster	Fabre	1184,2,0,0,0
+job_sword1.gat,201,36,0,0	monster	Fabre	1184,2,0,0,0
+job_sword1.gat,201,16,0,0	monster	Fabre	1184,2,0,0,0
+job_sword1.gat,239,44,0,0	monster	Fabre	1184,2,0,0,0
+job_sword1.gat,239,76,0,0	monster	Fabre	1184,2,0,0,0
+job_sword1.gat,231,101,0,0	monster	Fabre	1184,2,0,0,0
+job_sword1.gat,234,117,0,0	monster	Fabre	1184,2,0,0,0
+job_sword1.gat,198,91,0,0	monster	Fabre	1184,2,0,0,0
+job_sword1.gat,200,63,0,0	monster	Fabre	1184,2,0,0,0
 
 //==============================================================================
 // mapflag
 //==============================================================================
-sword_1-1.gat	mapflag	nomemo
-sword_1-1.gat	mapflag	noteleport
-sword_1-1.gat	mapflag	nosave	SavePoint
-sword_1-1.gat	mapflag	nopenalty
-sword_1-1.gat	mapflag	nobranch
-sword_1-1.gat	mapflag	noexp
-sword_1-1.gat	mapflag	noloot
+job_sword1.gat	mapflag	nomemo
+job_sword1.gat	mapflag	noteleport
+job_sword1.gat	mapflag	nosave	SavePoint
+job_sword1.gat	mapflag	nopenalty
+job_sword1.gat	mapflag	nobranch
+job_sword1.gat	mapflag	noexp
+job_sword1.gat	mapflag	noloot

npc/jobs/novice/novice.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Dr.Evil & MasterOfMuppets
 //===== Current Version: ===================================== 
-//= 1.5
+//= 1.6
 //===== Compatible With: ===================================== 
 //= eAthena SVN 3422+(Requires jA Script System)
 //===== Description: ========================================= 
@@ -17,21 +17,22 @@
 //= 1.3 Removed Duplicates [Toms]
 //= 1.4 Added Kafra Free Cart Tickets, as in official one [Lupus]
 //= 1.5 Fixed warps, removed map duplicates, typos [Lupus]
+//= 1.6 Changed clone maps new_1-? -> new_zone0? [Lupus]
 //============================================================ 
 
 //====================================================================
 //Ragnarok Online Novice Script by yukito
 //====================================================================
 //Bulletin Board
-new_1-1.gat,66,114,4	script	Bulletin Board	111,{
+new_zone01.gat,66,114,4	script	Bulletin Board	111,{
 	mes "^FF0000=================================^000000";
 	mes "^FF0000 ==^000000 ^E40CAA[Welcome] ^CC0000to^FF9000Training ^0000FFGrounds^FF0000==^000000";
 	mes "^FF0000=================================^000000";
 	close;
 }
 
-new_1-1.gat,53,114,4	script	Shion	727,{
-	if(BaseJob != Job_Novice || Upper) goto L_Fail;
+new_zone01.gat,53,114,4	script	Shion	727,{
+	if(Class != Job_Novice || Upper) goto L_Fail;
 	switch (NEW_MES_FLAG0) {
 	case 0:	mes "[Shion]";
 		mes "Hello there~";
@@ -87,8 +88,8 @@ new_1-1.gat,53,114,4	script	Shion	727,{
 			close;
 		case 2:	mes "[Shion]";
 			mes "Interface...";
-			mes "click','double-click'";
-			mes "and  'drag'is? .";
+			mes "click', 'double-click'";
+			mes "and 'drag' is? .";
 			mes "click just one time,";
 			mes "it is called 'click'";
 			mes "click twice straightly,";
@@ -96,7 +97,7 @@ new_1-1.gat,53,114,4	script	Shion	727,{
 			next;
 			mes "[Shion]";
 			mes "'Drag' is dragging your mouse";
-			mes "to the right, left,  up and down";
+			mes "to the right, left, up and down";
 			mes "when holding 'left-click'.";
 			mes "when you block a sentence in word";
 			mes "processor program";
@@ -211,14 +212,14 @@ L_Fail:
 	end;
 }
 
-new_1-1.gat,144,116,2	script	Guard#01	105,{
+new_zone01.gat,144,116,2	script	Guard#01	105,{
 	mes "[Training Grounds Guard]";
 	mes "Welcome to the Training Grounds.";
 	mes "You are now in the outer court yard. Please go inside the castle to begin your training.";
 	close;
 }
 
-new_1-1.gat,144,107,2	script	Guard#02	105,{
+new_zone01.gat,144,107,2	script	Guard#02	105,{
 	mes "[Training Grounds Guard]";
 	if(rand(2)) {
 		mes "Come in!";
@@ -239,8 +240,8 @@ new_1-1.gat,144,107,2	script	Guard#02	105,{
 }
 
 //Receptionist
-new_1-2.gat,100,29,4	script	Receptionist	86,{
-	if(BaseJob != Job_Novice || Upper) goto L_Fail;
+new_zone02.gat,100,29,4	script	Receptionist	86,{
+	if(Class != Job_Novice || Upper) goto L_Fail;
 	mes "[Training Grounds Receptionist]";
 	mes "Welcome!";
 	mes "You are at the entrance";
@@ -266,7 +267,7 @@ L_loop:
 		mes "to the Training Grounds.";
 		close2;
 		set Zeny,Zeny+50;
-		warp "new_1-2.gat",100,70;
+		warp "new_zone02.gat",100,70;
 		end;
 	case 2:	mes "[Training Grounds Receptionist]";
 		mes "I understand.";
@@ -338,7 +339,7 @@ L_Fail:
 }
 
 //Interfaces Instructor
-new_1-2.gat,99,105,4	script	Interfaces Instructor	751,{
+new_zone02.gat,99,105,4	script	Interfaces Instructor	751,{
 	if (!(NEW_MES_FLAG1)) {
 		mes "[Chris]";
 		mes "Nice to meet you. could you show me your application?";
@@ -411,7 +412,7 @@ new_1-2.gat,99,105,4	script	Interfaces Instructor	751,{
 			mes "If you think you need to take more lectures,";
 			mes "Come to see me anytime.";
 			close2;
-			warp "new_1-2.gat",28,178;
+			warp "new_zone02.gat",28,178;
 			end;
 		case 3:	emotion e_swt2;
 			close;
@@ -431,7 +432,7 @@ new_1-2.gat,99,105,4	script	Interfaces Instructor	751,{
 			mes "Well, find the skill instructor.";
 			mes "I will send you to him for free of charge.";
 			close2;
-			warp "new_1-2.gat",84,107;
+			warp "new_zone02.gat",84,107;
 			end;
 		case 2:	mes "[Chris]";
 			mes "I will send you to the next course,";
@@ -445,7 +446,7 @@ new_1-2.gat,99,105,4	script	Interfaces Instructor	751,{
 				mes "[Chris]";
 				mes "I wish you good luck.";
 				close2;
-				warp "new_1-2.gat",28,178;
+				warp "new_zone02.gat",28,178;
 				end;
 			}
 		case 3:	emotion e_swt2;
@@ -467,7 +468,7 @@ new_1-2.gat,99,105,4	script	Interfaces Instructor	751,{
 			mes "Well, Go to the item instructor.";
 			mes "I will send you to him for free of charge.";
 			close2;
-			warp "new_1-2.gat",115,107;
+			warp "new_zone02.gat",115,107;
 			end;
 		case 2:	mes "[Chris]";
 			mes "I will send you to the next course,";
@@ -481,7 +482,7 @@ new_1-2.gat,99,105,4	script	Interfaces Instructor	751,{
 				mes "[Chris]";
 				mes "I wish you good luck.";
 				close2;
-				warp "new_1-2.gat",28,178;
+				warp "new_zone02.gat",28,178;
 				end;
 			}
 		case 3:	emotion e_swt2;
@@ -500,7 +501,7 @@ new_1-2.gat,99,105,4	script	Interfaces Instructor	751,{
 		mes "Pay attention to what he says, and finish the course safely.";
 		mes "I wish you good luck.";
 		close2;
-		warp "new_1-2.gat",28,178;
+		warp "new_zone02.gat",28,178;
 		end;
 	case 2:	mes "[Chris]";
 		mes "That is a good idea.";
@@ -524,7 +525,7 @@ new_1-2.gat,99,105,4	script	Interfaces Instructor	751,{
 		mes "'Teleportation Service'";
 		mes "'Storage Service'";
 		mes "Meet them";
-		mes "and use their service..";
+		mes "and use their service.";
 		next;
 		mes "[Chris]";
 		mes ".......If you leave here";
@@ -536,7 +537,7 @@ new_1-2.gat,99,105,4	script	Interfaces Instructor	751,{
 	}
 }
 
-new_1-2.gat,83,111,4	script	Skill Instructor	753,{
+new_zone02.gat,83,111,4	script	Skill Instructor	753,{
 	if (!(NEW_MES_FLAG2)) {
 		mes "[Shecil]";
 		mes ""+strcharinfo(0)+"";
@@ -556,7 +557,7 @@ new_1-2.gat,83,111,4	script	Skill Instructor	753,{
 			mes "Click ^0000FFSkill^000000.";
 			mes "Another window pops up, right?";
 			mes "Short key is ^0000FFS when holding down alt^000000.";
-			mes "From now we will say like 'alt+s'.";
+			mes "From now we will say like 'Alt+S'.";
 			set NEW_MES_FLAG2,1;
 			set JobExp,JobExp+151;
 			next;
@@ -660,7 +661,7 @@ new_1-2.gat,83,111,4	script	Skill Instructor	753,{
 			mes "Hahaha.";
 			mes "I will send you to the service.";
 			close2;
-			warp "new_1-2.gat",115,107;
+			warp "new_zone02.gat",115,107;
 			break;
 		case 2:	goto L_battle;
 		case 3:	emotion e_omg;
@@ -684,7 +685,7 @@ new_1-2.gat,83,111,4	script	Skill Instructor	753,{
 		mes "My fists have gotten a bit rusty.";
 		mes "Ok, I will send you! You should grow up well!";
 		close2;
-		warp "new_1-2.gat",28,178;
+		warp "new_zone02.gat",28,178;
 		end;
 	case 2:	mes "[Shecil]";
 		mes "Huh? you look like";
@@ -726,11 +727,11 @@ L_battle:
 	mes "Practical Course!";
 	mes "Cheer up!";
 	close2;
-	warp "new_1-2.gat",28,178;
+	warp "new_zone02.gat",28,178;
 	end;
 }
 
-new_1-2.gat,115,111,4	script	Item Instructor	726,{
+new_zone02.gat,115,111,4	script	Item Instructor	726,{
 	disable_items;
 	if (!(NEW_MES_FLAG3)) {
 		mes "[Alice]";
@@ -876,7 +877,7 @@ new_1-2.gat,115,111,4	script	Item Instructor	726,{
 			mes "I will send you there.";
 			mes "Study Hard!";
 			close2;
-			warp "new_1-2.gat",84,107;
+			warp "new_zone02.gat",84,107;
 			end;
 	}
 	mes "[Alice]";
@@ -898,7 +899,7 @@ new_1-2.gat,115,111,4	script	Item Instructor	726,{
 			mes "Wear those tight.";
 			mes "Ok, I will let you go.";
 			close2;
-			warp "new_1-2.gat",28,178;
+			warp "new_zone02.gat",28,178;
 			end;
 		} else {
 			mes "[Alice]";
@@ -923,7 +924,7 @@ L_battle1:
 		mes "Ok, I will send you there.";
 		mes "Goodbye.";
 		close2;
-		warp "new_1-2.gat",28,178;
+		warp "new_zone02.gat",28,178;
 		end;
 	} else {
 		mes "[Alice]";
@@ -945,7 +946,7 @@ L_bye:
 	close;
 }
 
-new_1-2.gat,118,108,4	script	Kafra Employee	94,{
+new_zone02.gat,118,108,4	script	Kafra Employee	94,{
 	mes "[Kafra Employee]";
 	mes "Welcome to";
 	mes "Kafra Corporation.";
@@ -988,7 +989,7 @@ new_1-2.gat,118,108,4	script	Kafra Employee	94,{
 				mes "[Kafra Employee]";
 				mes "You will be sent to Practical Course.";
 				close2;
-				warp "new_1-2.gat",28,178;
+				warp "new_zone02.gat",28,178;
 				end;
 			}
 			set @menu,@menu-1;
@@ -1179,7 +1180,7 @@ L_prewarp:
 	return;
 }
 
-new_1-2.gat,121,101,2	script	Guide Soldier	105,{
+new_zone02.gat,121,101,2	script	Guide Soldier	105,{
 	mes "[Soldier]";
 	mes "We, Soldiers, are guiding Novices here in the gate way of town.";
 	mes "When you go to a new town, Please visit Guide Soldier and receive their information for the map.";
@@ -1196,7 +1197,7 @@ new_1-2.gat,121,101,2	script	Guide Soldier	105,{
 }
 
 //Interface Assistant
-new_1-2.gat,161,182,6	script	Interface Assistant	92,{
+new_zone02.gat,161,182,6	script	Interface Assistant	92,{
 	mes "[Edwin]";
 	mes "I am an Interface Assistant.";
 	mes "Choose what you want to know more about.";
@@ -1334,7 +1335,7 @@ L_loop:
 	goto L_loop;
 }
 
-new_1-2.gat,182,182,4	script	Status Assistant	754,{
+new_zone02.gat,182,182,4	script	Status Assistant	754,{
 	mes "[Jarre Riotte]";
 	mes "Welcome new adventurer.";
 	mes "I, Jarre Riotte will help you learn about the fundamental rules of your characters status.";
@@ -1578,7 +1579,7 @@ L_loop:
 	goto L_loop;
 }
 
-new_1-2.gat,184,172,4	script	Skill Assistant	47,{
+new_zone02.gat,184,172,4	script	Skill Assistant	47,{
 	mes "[Pitch Judas]";
 	mes "Welcome. I have been waiting for";
 	mes "you for a long time!!";
@@ -1953,9 +1954,9 @@ L_loop1:
 }
 
 //Potato Merchant
-new_1-2.gat,28,185,4	shop	Potato Merchant	90,516:15
+new_zone02.gat,28,185,4	shop	Potato Merchant	90,516:15
 
-new_1-2.gat,38,182,4	script	Helper	92,{
+new_zone02.gat,38,182,4	script	Helper	92,{
 	if (!(NEW_MES_FLAG5)) {
 		if (!(NEW_MES_FLAG4)) {
 			mes "[Kane]";
@@ -2000,8 +2001,8 @@ new_1-2.gat,38,182,4	script	Helper	92,{
 				getitem 611,2;
 				getitem 569,300;
 				close2;
-				savepoint "new_1-2.gat",24,188;
-				warp "new_1-3.gat",96,21;
+				savepoint "new_zone02.gat",24,188;
+				warp "new_zone03.gat",96,21;
 				end;
 			} else {
 				mes "[Kane]";
@@ -2038,7 +2039,7 @@ new_1-2.gat,38,182,4	script	Helper	92,{
 			percentheal 100,100;
 		}
 		close2;
-		warp "new_1-3.gat",96,21;
+		warp "new_zone03.gat",96,21;
 		end;
 	} else {
 		mes "[Kane]";
@@ -2050,7 +2051,7 @@ new_1-2.gat,38,182,4	script	Helper	92,{
 	}
 }
 
-new_1-2.gat,17,182,6	script	Helper#2	84,{
+new_zone02.gat,17,182,6	script	Helper#2	84,{
 	if (!(NEW_MES_FLAG4)) {
 		mes "[Elmeen]";
 		mes "Congratulations!";
@@ -2359,7 +2360,7 @@ L_equip:
 }
 
 //Training Center Employee
-new_1-3.gat,95,30,4	script	Training Center Employee#1	84,{
+new_zone03.gat,95,30,4	script	Training Center Employee#1	84,{
 	mes "[Hoffman]";
 	mes "Hey there~";
 	mes "I'm here to provide";
@@ -2379,7 +2380,7 @@ new_1-3.gat,95,30,4	script	Training Center Employee#1	84,{
 	close;
 }
 
-new_1-3.gat,96,174,4	script	Keyman#1	85,{
+new_zone03.gat,96,174,4	script	Keyman#1	85,{
 	mes "[Keyman]";
 	mes "Hmmm!";
 	mes "You have practised a lot, would you like to go on with further training?";
@@ -2388,7 +2389,7 @@ new_1-3.gat,96,174,4	script	Keyman#1	85,{
 		mes "[Keyman]";
 		mes "Don't forget about everything you've learnt here. Have a nice trip.";
 		close2;
-		warp "new_1-4.gat",99,10;
+		warp "new_zone04.gat",99,10;
 		end;
 	}
 	mes "[Keyman]";
@@ -2397,7 +2398,7 @@ new_1-3.gat,96,174,4	script	Keyman#1	85,{
 }
 
 //Novice Instructor
-new_1-4.gat,91,22,4	script	Novice Instructor	57,{
+new_zone04.gat,91,22,4	script	Novice Instructor	57,{
 	mes "[Bruce]";
 	mes "You have come from far away.";
 	mes "Thank you for coming here";
@@ -2611,7 +2612,7 @@ L_loop:
 	goto L_loop;
 }
 
-new_1-4.gat,100,29,4	script	Final Instructor	46,{
+new_zone04.gat,100,29,4	script	Final Instructor	46,{
 	if (!(NEW_MES_FLAG6)) {
 		mes "[Hanson]";
 		mes "Nice to meet you.";
@@ -3408,17 +3409,17 @@ L_cleararg:
 }
 
 // Training Ground Mobs
-new_1-3.gat,0,0,0,0	monster	Fabre	1184,5,0,0,0
-new_1-3.gat,0,0,0,0	monster	Poring	1002,10,0,0,0
-new_1-3.gat,0,0,0,0	monster	ChonChon	1011,10,0,0,0
-new_1-3.gat,0,0,0,0	monster	Lunatic	1063,10,0,0,0
-new_1-3.gat,0,0,0,0	monster	Drops	1113,10,0,0,0
+new_zone03.gat,0,0,0,0	monster	Fabre	1184,5,0,0,0
+new_zone03.gat,0,0,0,0	monster	Poring	1002,10,0,0,0
+new_zone03.gat,0,0,0,0	monster	ChonChon	1011,10,0,0,0
+new_zone03.gat,0,0,0,0	monster	Lunatic	1063,10,0,0,0
+new_zone03.gat,0,0,0,0	monster	Drops	1113,10,0,0,0
 // Unsure about the following mobs
-new_1-3.gat,0,0,0,0	monster	Condor	1009,2,0,0,0
-new_1-3.gat,0,0,0,0	monster	Willow	1010,2,0,0,0
-new_1-3.gat,0,0,0,0	monster	Roda Frog	1012,2,0,0,0
-new_1-3.gat,0,0,0,0	monster	Shell Picky	1050,2,0,0,0
-new_1-3.gat,0,0,0,0	monster	Spore	1014,1,0,0,0
-new_1-3.gat,0,0,0,0	monster	Thief Bug Larva	1051,1,0,0,0
-new_1-3.gat,0,0,0,0	monster	Rocker	1052,1,0,0,0
-new_1-3.gat,0,0,0,0	monster	Thief Bug Female	1017,1,0,0,0
+new_zone03.gat,0,0,0,0	monster	Condor	1009,2,0,0,0
+new_zone03.gat,0,0,0,0	monster	Willow	1010,2,0,0,0
+new_zone03.gat,0,0,0,0	monster	Roda Frog	1012,2,0,0,0
+new_zone03.gat,0,0,0,0	monster	Shell Picky	1050,2,0,0,0
+new_zone03.gat,0,0,0,0	monster	Spore	1014,1,0,0,0
+new_zone03.gat,0,0,0,0	monster	Thief Bug Larva	1051,1,0,0,0
+new_zone03.gat,0,0,0,0	monster	Rocker	1052,1,0,0,0
+new_zone03.gat,0,0,0,0	monster	Thief Bug Female	1017,1,0,0,0

npc/merchants/socket_enchant.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Sousuke_PL
 //===== Current Version: =====================================
-//= 0.2
+//= 0.3
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -13,12 +13,12 @@
 //= 0.1a added missing L_No: to 2 funcs [Lupus]
 //= 0.1b Removed duplicates [Toms]
 //= 0.2	Added missing next;'s [Evera]
+//= 0.3 Fixed Zweihander[+] id [Lupus]
 //============================================================
 
 
 lhz_in02.gat,281,35,5	script	Socket Enchant	84,{
 
-
   mes "[Socket Enchant]";
   mes "Hello.";
   mes "How can I help you?";
@@ -162,7 +162,7 @@ lhz_in02.gat,281,35,5	script	Socket Enchant	84,{
 
       Zweihander:
            set @olditem,1168;
-           set @newitem,1716;
+           set @newitem,1171;
            callfunc "f_weapon_a3";
 
       Flamberge:

npc/warps/other/jobquests.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.4a
+//= 1.5
 //===== Compatible With: =====================================
 //= Any Athena Version; RO Version Ep4+
 //===== Description: =========================================
@@ -17,33 +17,33 @@
 //= Removed unused, duplicate warps. [kobra_k88]
 //= 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]
 //============================================================
 
 
 //==============================================================================
 //Novice
 //==============================================================================
-new_1-1.gat,148,112,0		warp	newwarp6001		2,2,new_1-2.gat,100,9
-new_1-2.gat,100,6,0 		warp	newwarp6002		2,2,new_1-1.gat,144,112
-new_1-2.gat,126,106,0		warp	newwarp6003		2,2,new_1-2.gat,160,171
-new_1-2.gat,156,171,0		warp	newwarp6004		2,2,new_1-2.gat,123,106
-new_1-2.gat,73,106,0		warp	newwarp6005		2,2,new_1-2.gat,41,172
-new_1-2.gat,46,172,0		warp	newwarp6006		2,2,new_1-2.gat,78,106
-//new_1-3.gat,96,175,0	warp	new17	3,2,new_1-4.gat,100,14
+new_zone01.gat,148,112,0	warp	newwarp6001	2,2,new_zone02.gat,100,9
+new_zone02.gat,100,6,0	warp	newwarp6002	2,2,new_zone01.gat,144,112
+new_zone02.gat,126,106,0	warp	newwarp6003	2,2,new_zone02.gat,160,171
+new_zone02.gat,156,171,0	warp	newwarp6004	2,2,new_zone02.gat,123,106
+new_zone02.gat,73,106,0	warp	newwarp6005	2,2,new_zone02.gat,41,172
+new_zone02.gat,46,172,0	warp	newwarp6006	2,2,new_zone02.gat,78,106
 
 //==============================================================================
 //Swordman
 //==============================================================================
-sword_1-1.gat,192,244,0	warp	SwordWarp0	2,2,sword_1-1.gat,215,244
-sword_1-1.gat,223,243,0	warp	SwordWarp1	2,2,sword_1-1.gat,12,206
-sword_1-1.gat,192,206,0	warp	SwordWarp2	2,2,sword_1-1.gat,215,205
-sword_1-1.gat,223,205,0	warp	SwordWarp3	2,2,sword_1-1.gat,12,168
-sword_1-1.gat,192,168,0	warp	SwordWarp4	2,2,sword_1-1.gat,215,167
+job_sword1.gat,192,244,0	warp	SwordWarp0	2,2,job_sword1.gat,215,244
+job_sword1.gat,223,243,0	warp	SwordWarp1	2,2,job_sword1.gat,12,206
+job_sword1.gat,192,206,0	warp	SwordWarp2	2,2,job_sword1.gat,215,205
+job_sword1.gat,223,205,0	warp	SwordWarp3	2,2,job_sword1.gat,12,168
+job_sword1.gat,192,168,0	warp	SwordWarp4	2,2,job_sword1.gat,215,167
 // Underground cave
-sword_1-1.gat,65,117,0	warp	swd101	1,1,sword_1-1.gat,10,245
-sword_1-1.gat,98,27,0	warp	swd102	1,1,sword_1-1.gat,11,207
-sword_1-1.gat,161,27,0	warp	swd103	1,1,sword_1-1.gat,11,207
-sword_1-1.gat,239,117,0	warp	swd106	1,1,sword_1-1.gat,11,169
+job_sword1.gat,65,117,0	warp	swd101	1,1,job_sword1.gat,10,245
+job_sword1.gat,98,27,0	warp	swd102	1,1,job_sword1.gat,11,207
+job_sword1.gat,161,27,0	warp	swd103	1,1,job_sword1.gat,11,207
+job_sword1.gat,239,117,0	warp	swd106	1,1,job_sword1.gat,11,169
 
 //==============================================================================
 //Thief

src/char/char.c

@@ -4332,7 +4332,7 @@ int do_init(int argc, char **argv) {
 	int i;
 
 	mapindex_init(); //Needed here for the start-point reading.
-	start_point.map = mapindex_name2id("new_1-1.gat");
+	start_point.map = mapindex_name2id("new_zone01.gat");
 	char_config_read((argc < 2) ? CHAR_CONF_NAME : argv[1]);
 	char_lan_config_read((argc > 3) ? argv[3] : LOGIN_LAN_CONF_NAME);
 

src/char_sql/char.c

@@ -4203,7 +4203,7 @@ int do_init(int argc, char **argv){
 
 	//Read map indexes
 	mapindex_init();
-	start_point.map = mapindex_name2id("new_1-1.gat");
+	start_point.map = mapindex_name2id("new_zone01.gat");
 	
 	char_config_read((argc < 2) ? CHAR_CONF_NAME : argv[1]);
 	char_lan_config_read((argc > 3) ? argv[3] : LAN_CONF_NAME);

src/map/atcommand.c

@@ -3295,7 +3295,7 @@ int atcommand_go(
 		{ MAP_UMBALA,		89,  157  },		//	12=Umbala
 		{ MAP_NIFLHEIM,	21,  153  },		//	13=Niflheim
 		{ MAP_LOUYANG,		217,  40  },	//	14=Lou Yang
-		{ "new_1-1.gat",		53,  111  },	//	15=Training Grounds
+		{ "new_zone01.gat",		53,  111  },	//	15=Training Grounds
 		{ MAP_JAIL,		23,   61  },	//	16=Prison
 		{ MAP_JAWAII,		249, 127  },		//  17=Jawaii
 		{ MAP_AYOTHAYA,	151, 117  },		//  18=Ayothaya
@@ -3376,7 +3376,7 @@ int atcommand_go(
 			town = 13;
 		} else if (strncmp(map_name, "louyang.gat", 3) == 0) { // 3 first characters
 			town = 14;
-		} else if (strncmp(map_name, "new_1-1.gat", 3) == 0 || // 3 first characters (or "newbies")
+		} else if (strncmp(map_name, "new_zone01.gat", 3) == 0 || // 3 first characters (or "newbies")
 		           strncmp(map_name, "startpoint.gat", 3) == 0 || // name of the position (3 first characters)
 		           strncmp(map_name, "begining.gat", 3) == 0) { // name of the position (3 first characters)
 			town = 15;