19 files changed, 639 insertions, 640 deletions

diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt
index c7322d1df..9ee62e942 100644
--- a/npc/warps/fields/abyss_warper.txt
+++ b/npc/warps/fields/abyss_warper.txt
@@ -14,7 +14,7 @@
 //= 1.2 Fixed tab - missing pillar's appeared [Lupus]
 //============================================================
 
-hu_fild05.gat,168,303,0	script	Pillar#01	111,{
+hu_fild05,168,303,0	script	Pillar#01	111,{
 	mes "[Ancient Voice]";
 	mes "So, you wish access to the Abyss Cave?";
 	mes "You have to bring me then 1 Dragon Canine, 1 Dragon Tail and 1 Dragon Scale";
@@ -60,12 +60,12 @@ OnInit:
 }
 
 
-hu_fild05.gat,171,212,0	script	Pillar#02	111,{
+hu_fild05,171,212,0	script	Pillar#02	111,{
 	mes "[Ancient Voice]";
 	mes "Leave the island?";
 	next;
 	menu "Yes",-,"No",L_close;
-	warp "hu_fild05.gat",168,301;
+	warp "hu_fild05",168,301;
 	end;
 
 L_close:
@@ -74,4 +74,4 @@ L_close:
 	close;
 }
 
-hu_fild05.gat,197,210,0	warp	warpabyss	2,3,abyss_01.gat,264,271
+hu_fild05,197,210,0	warp	warpabyss	2,3,abyss_01,264,271
\ No newline at end of file
diff --git a/npc/warps/fields/amatsu_fild.txt b/npc/warps/fields/amatsu_fild.txt
index 19df68ff5..a593dd34d 100644
--- a/npc/warps/fields/amatsu_fild.txt
+++ b/npc/warps/fields/amatsu_fild.txt
@@ -14,9 +14,9 @@
 
 //= Amatsu Fields ============================================
 // removed
-//ama_fild.gat,154,301,0	warp	warp1998	1,1,prontera.gat,163,186
-//ama_fild.gat,174,132,0	warp	warp1996	1,1,prontera.gat,163,186
-//ama_fild.gat,193,302,0	warp	warp1997	1,1,prontera.gat,163,186
-//ama_fild.gat,330,141,0	warp	warp1999	1,1,prontera.gat,163,186
-ama_fild01.gat,174,332,0	warp	warp8003	1,1,ama_in01.gat,175,174
-ama_fild01.gat,75,29,0	warp	warp1961	1,1,amatsu.gat,247,287
\ No newline at end of file
+//ama_fild,154,301,0	warp	warp1998	1,1,prontera,163,186
+//ama_fild,174,132,0	warp	warp1996	1,1,prontera,163,186
+//ama_fild,193,302,0	warp	warp1997	1,1,prontera,163,186
+//ama_fild,330,141,0	warp	warp1999	1,1,prontera,163,186
+ama_fild01,174,332,0	warp	warp8003	1,1,ama_in01,175,174
+ama_fild01,75,29,0	warp	warp1961	1,1,amatsu,247,287
\ No newline at end of file
diff --git a/npc/warps/fields/com_fild.txt b/npc/warps/fields/com_fild.txt
index 1215e136b..3e6f34046 100644
--- a/npc/warps/fields/com_fild.txt
+++ b/npc/warps/fields/com_fild.txt
@@ -13,41 +13,41 @@
 //============================================================
 
 //= Comodo Fields ============================================
-cmd_fild01.gat,222,24,0	warp	cmdf01	1,1,cmd_fild02.gat,222,372
-cmd_fild01.gat,26,318,0	warp	cmdf001	1,1,beach_dun3.gat,281,56
-cmd_fild01.gat,362,263,0	warp	cmdf03	1,1,cmd_fild03.gat,27,269
-cmd_fild01.gat,362,73,0	warp	cmdf02	1,1,cmd_fild03.gat,27,68
-cmd_fild02.gat,222,376,0	warp	cmdf01-1	1,1,cmd_fild01.gat,222,30
-cmd_fild02.gat,358,95,0	warp	cmdf04	1,1,cmd_fild04.gat,35,94
-cmd_fild02.gat,382,269,0	warp	cmdf05	1,1,cmd_fild04.gat,25,275
-cmd_fild03.gat,181,17,0	warp	cmdf06	1,1,cmd_fild04.gat,181,367
-cmd_fild03.gat,23,269,0	warp	cmdf03-1	1,1,cmd_fild01.gat,359,260
-cmd_fild03.gat,23,68,0	warp	cmdf02-1	1,1,cmd_fild01.gat,359,76
-cmd_fild03.gat,384,165,0	warp	cmdf07	1,1,cmd_fild05.gat,26,161
-cmd_fild04.gat,180,372,0	warp	cmdf06-1	1,1,cmd_fild03.gat,183,23
-cmd_fild04.gat,21,275,0	warp	cmdf05-1	1,1,cmd_fild02.gat,378,264
-cmd_fild04.gat,31,92,0	warp	cmdf04-1	1,1,cmd_fild02.gat,351,92
-cmd_fild04.gat,376,287,0	warp	cmdf08	1,1,cmd_fild06.gat,26,288
-cmd_fild05.gat,148,19,0	warp	cmdf09	1,1,cmd_fild06.gat,150,374
-cmd_fild05.gat,21,163,0	warp	cmdf07-1	1,1,cmd_fild03.gat,377,167
-cmd_fild06.gat,150,380,0	warp	cmdf09-1	1,1,cmd_fild05.gat,146,27
-cmd_fild06.gat,151,27,0	warp	cmfd10	1,1,cmd_fild07.gat,147,370
-cmd_fild06.gat,21,285,0	warp	cmdf08-1	1,1,cmd_fild04.gat,371,288
-cmd_fild06.gat,368,96,0	warp	cmdf11	1,1,cmd_fild08.gat,25,102
-cmd_fild06.gat,372,359,0	warp	cmdf12	1,1,cmd_fild08.gat,31,359
-cmd_fild06.gat,379,174,0	warp	cmdf13	1,1,cmd_fild08.gat,28,166
-cmd_fild07.gat,149,379,0	warp	cmdf10-1	10,1,cmd_fild06.gat,147,36
-cmd_fild07.gat,389,186,0	warp	cmdf14-1	1,3,cmd_fild09.gat,18,170
-cmd_fild08.gat,15,102,0	warp	cmdf11-1	1,1,cmd_fild06.gat,361,96
-cmd_fild08.gat,25,170,0	warp	cmdf13-1	1,1,cmd_fild06.gat,374,167
-cmd_fild08.gat,25,355,0	warp	cmdf12-1	1,1,cmd_fild06.gat,369,359
-cmd_fild08.gat,309,48,0	warp	cmdf16	2,1,cmd_fild09.gat,307,374
-cmd_fild08.gat,76,31,0	warp	cmdf15	2,1,cmd_fild09.gat,76,375
-cmd_fild09.gat,12,170,0	warp	cmdf14-2	1,4,cmd_fild07.gat,382,184
-cmd_fild09.gat,309,381,0	warp	cmdf16-1	2,1,cmd_fild08.gat,309,60
-cmd_fild09.gat,75,382,0	warp	cmdf15-1	2,1,cmd_fild08.gat,75,42
+cmd_fild01,222,24,0	warp	cmdf01	1,1,cmd_fild02,222,372
+cmd_fild01,26,318,0	warp	cmdf001	1,1,beach_dun3,281,56
+cmd_fild01,362,263,0	warp	cmdf03	1,1,cmd_fild03,27,269
+cmd_fild01,362,73,0	warp	cmdf02	1,1,cmd_fild03,27,68
+cmd_fild02,222,376,0	warp	cmdf01-1	1,1,cmd_fild01,222,30
+cmd_fild02,358,95,0	warp	cmdf04	1,1,cmd_fild04,35,94
+cmd_fild02,382,269,0	warp	cmdf05	1,1,cmd_fild04,25,275
+cmd_fild03,181,17,0	warp	cmdf06	1,1,cmd_fild04,181,367
+cmd_fild03,23,269,0	warp	cmdf03-1	1,1,cmd_fild01,359,260
+cmd_fild03,23,68,0	warp	cmdf02-1	1,1,cmd_fild01,359,76
+cmd_fild03,384,165,0	warp	cmdf07	1,1,cmd_fild05,26,161
+cmd_fild04,180,372,0	warp	cmdf06-1	1,1,cmd_fild03,183,23
+cmd_fild04,21,275,0	warp	cmdf05-1	1,1,cmd_fild02,378,264
+cmd_fild04,31,92,0	warp	cmdf04-1	1,1,cmd_fild02,351,92
+cmd_fild04,376,287,0	warp	cmdf08	1,1,cmd_fild06,26,288
+cmd_fild05,148,19,0	warp	cmdf09	1,1,cmd_fild06,150,374
+cmd_fild05,21,163,0	warp	cmdf07-1	1,1,cmd_fild03,377,167
+cmd_fild06,150,380,0	warp	cmdf09-1	1,1,cmd_fild05,146,27
+cmd_fild06,151,27,0	warp	cmfd10	1,1,cmd_fild07,147,370
+cmd_fild06,21,285,0	warp	cmdf08-1	1,1,cmd_fild04,371,288
+cmd_fild06,368,96,0	warp	cmdf11	1,1,cmd_fild08,25,102
+cmd_fild06,372,359,0	warp	cmdf12	1,1,cmd_fild08,31,359
+cmd_fild06,379,174,0	warp	cmdf13	1,1,cmd_fild08,28,166
+cmd_fild07,149,379,0	warp	cmdf10-1	10,1,cmd_fild06,147,36
+cmd_fild07,389,186,0	warp	cmdf14-1	1,3,cmd_fild09,18,170
+cmd_fild08,15,102,0	warp	cmdf11-1	1,1,cmd_fild06,361,96
+cmd_fild08,25,170,0	warp	cmdf13-1	1,1,cmd_fild06,374,167
+cmd_fild08,25,355,0	warp	cmdf12-1	1,1,cmd_fild06,369,359
+cmd_fild08,309,48,0	warp	cmdf16	2,1,cmd_fild09,307,374
+cmd_fild08,76,31,0	warp	cmdf15	2,1,cmd_fild09,76,375
+cmd_fild09,12,170,0	warp	cmdf14-2	1,4,cmd_fild07,382,184
+cmd_fild09,309,381,0	warp	cmdf16-1	2,1,cmd_fild08,309,60
+cmd_fild09,75,382,0	warp	cmdf15-1	2,1,cmd_fild08,75,42
 
 //Others =======================
-cmd_fild08.gat,354,324,0	warp	cmd008	1,1,moc_fild12.gat,26,305
-cmd_fild09.gat,369,164,0	warp	cmd009	2,2,moc_fild18.gat,55,170
-moc_fild18.gat,51,170,0	warp	cmd010	1,3,cmd_fild09.gat,363,164
\ No newline at end of file
+cmd_fild08,354,324,0	warp	cmd008	1,1,moc_fild12,26,305
+cmd_fild09,369,164,0	warp	cmd009	2,2,moc_fild18,55,170
+moc_fild18,51,170,0	warp	cmd010	1,3,cmd_fild09,363,164
\ No newline at end of file
diff --git a/npc/warps/fields/ein_fild.txt b/npc/warps/fields/ein_fild.txt
index 348c53df7..ef6523884 100644
--- a/npc/warps/fields/ein_fild.txt
+++ b/npc/warps/fields/ein_fild.txt
@@ -16,38 +16,38 @@
 
 
 //Einbroch Field <-> Juno Field
-yuno_fild04.gat,251,21,0	warp	ein001	1,1,ein_fild06.gat,252,363
-ein_fild06.gat,252,365,0	warp	ein001a	1,1,yuno_fild04.gat,251,23
-yuno_fild07.gat,73,219,0	warp	ein002	1,1,ein_fild06.gat,338,170
-ein_fild06.gat,340,170,0	warp	ein002a	1,1,yuno_fild07.gat,75,219
-yuno_fild07.gat,56,76,0	warp	ein003	1,1,ein_fild06.gat,354,94
-ein_fild06.gat,356,94,0	warp	ein003a	1,1,yuno_fild07.gat,58,76
-yuno_fild11.gat,28,266,0	warp	ein004	1,1,ein_fild07.gat,380,263
-ein_fild07.gat,382,263,0	warp	ein004a	1,1,yuno_fild11.gat,30,266
+yuno_fild04,251,21,0	warp	ein001	1,1,ein_fild06,252,363
+ein_fild06,252,365,0	warp	ein001a	1,1,yuno_fild04,251,23
+yuno_fild07,73,219,0	warp	ein002	1,1,ein_fild06,338,170
+ein_fild06,340,170,0	warp	ein002a	1,1,yuno_fild07,75,219
+yuno_fild07,56,76,0	warp	ein003	1,1,ein_fild06,354,94
+ein_fild06,356,94,0	warp	ein003a	1,1,yuno_fild07,58,76
+yuno_fild11,28,266,0	warp	ein004	1,1,ein_fild07,380,263
+ein_fild07,382,263,0	warp	ein004a	1,1,yuno_fild11,30,266
 
 //Einbroch Field
-ein_fild06.gat,135,35,0	warp	ein005	1,1,ein_fild07.gat,147,360
-ein_fild07.gat,145,362,0	warp	ein005a	1,1,ein_fild06.gat,135,37
-ein_fild07.gat,191,42,0	warp	ein006	1,1,ein_fild10.gat,194,370
-ein_fild10.gat,194,372,0	warp	ein006a	1,1,ein_fild07.gat,191,44
-ein_fild10.gat,24,331,0	warp	ein007	1,1,ein_fild09.gat,327,346
-ein_fild09.gat,329,346,0	warp	ein007a	1,1,ein_fild10.gat,26,331
-ein_fild09.gat,34,132,0	warp	ein008	1,1,ein_fild08.gat,361,128
-ein_fild08.gat,363,128,0	warp	ein008a	1,1,ein_fild09.gat,36,132
+ein_fild06,135,35,0	warp	ein005	1,1,ein_fild07,147,360
+ein_fild07,145,362,0	warp	ein005a	1,1,ein_fild06,135,37
+ein_fild07,191,42,0	warp	ein006	1,1,ein_fild10,194,370
+ein_fild10,194,372,0	warp	ein006a	1,1,ein_fild07,191,44
+ein_fild10,24,331,0	warp	ein007	1,1,ein_fild09,327,346
+ein_fild09,329,346,0	warp	ein007a	1,1,ein_fild10,26,331
+ein_fild09,34,132,0	warp	ein008	1,1,ein_fild08,361,128
+ein_fild08,363,128,0	warp	ein008a	1,1,ein_fild09,36,132
 
 //Einbroch Field <-> Lighthalzen Field
-einbech.gat,62,29,0	warp	ein_fd03	1,1,ein_fild09.gat,74,350
-ein_fild09.gat,71,352,0	warp	ein_fd03a	1,1,einbech.gat,62,32
+einbech,62,29,0	warp	ein_fd03	1,1,ein_fild09,74,350
+ein_fild09,71,352,0	warp	ein_fd03a	1,1,einbech,62,32
 
-ein_fild04.gat,20,251,0	warp	ein046	1,1,ein_fild03.gat,361,257
-ein_fild03.gat,363,257,0	warp	ein046a	1,1,ein_fild04.gat,22,251
-ein_fild04.gat,14,215,0	warp	ein047	1,1,ein_fild03.gat,359,219
-ein_fild03.gat,361,219,0	warp	ein047a	1,1,ein_fild04.gat,16,215
-ein_fild04.gat,14,205,0	warp	ein048	1,1,ein_fild03.gat,359,204
-ein_fild03.gat,361,204,0	warp	ein048a	1,1,ein_fild04.gat,16,205
-ein_fild03.gat,142,32,0	warp	ein049	1,1,lhz_fild02.gat,166,365
-lhz_fild02.gat,166,367,0	warp	ein049a	1,1,ein_fild03.gat,142,34
-lhz_fild02.gat,164,37,0	warp	ein050	1,1,lhz_fild03.gat,158,347
-lhz_fild03.gat,158,349,0	warp	ein050a	1,1,lhz_fild02.gat,164,39
-lhz_fild03.gat,363,283,0	warp	ein051	1,1,ein_fild08.gat,25,275
-ein_fild08.gat,23,275,0	warp	ein051a	1,1,lhz_fild03.gat,361,283
+ein_fild04,20,251,0	warp	ein046	1,1,ein_fild03,361,257
+ein_fild03,363,257,0	warp	ein046a	1,1,ein_fild04,22,251
+ein_fild04,14,215,0	warp	ein047	1,1,ein_fild03,359,219
+ein_fild03,361,219,0	warp	ein047a	1,1,ein_fild04,16,215
+ein_fild04,14,205,0	warp	ein048	1,1,ein_fild03,359,204
+ein_fild03,361,204,0	warp	ein048a	1,1,ein_fild04,16,205
+ein_fild03,142,32,0	warp	ein049	1,1,lhz_fild02,166,365
+lhz_fild02,166,367,0	warp	ein049a	1,1,ein_fild03,142,34
+lhz_fild02,164,37,0	warp	ein050	1,1,lhz_fild03,158,347
+lhz_fild03,158,349,0	warp	ein050a	1,1,lhz_fild02,164,39
+lhz_fild03,363,283,0	warp	ein051	1,1,ein_fild08,25,275
+ein_fild08,23,275,0	warp	ein051a	1,1,lhz_fild03,361,283
\ No newline at end of file
diff --git a/npc/warps/fields/gefenia.txt b/npc/warps/fields/gefenia.txt
index 34b295be6..ac15da3ca 100644
--- a/npc/warps/fields/gefenia.txt
+++ b/npc/warps/fields/gefenia.txt
@@ -11,20 +11,19 @@
 //===== Description: =========================================
 //= Warp Points for Gefenia
 //===== Additional Comments: =================================
-//= 1.3 fixed gefenia03.gat,28,26 -> gefenia03.gat,58,26
+//= 1.3 fixed gefenia03,28,26 -> gefenia03,58,26
 //============================================================
-gefenia01.gat,37,103,0	warp	gefeniawarp014	1,1,gefenia04.gat,283,95
-gefenia01.gat,199,269,0	warp	gefeniawarp001	1,1,gefenia02.gat,203,34
-gefenia01.gat,220,256,0	warp	gefeniawarp003	1,1,gefenia02.gat,240,23
-gefenia02.gat,17,175,0	warp	gefeniawarp005	1,1,gefenia03.gat,266,168
-gefenia02.gat,19,237,0	warp	gefeniawarp007	1,1,gefenia03.gat,264,236
-gefenia02.gat,203,31,0	warp	gefeniawarp002	1,1,gefenia01.gat,199,266
-gefenia02.gat,240,20,0	warp	gefeniawarp004	1,1,gefenia01.gat,223,256
-gefenia03.gat,58,26,0	warp	gefeniawarp011	1,1,gefenia04.gat,33,270
-gefenia03.gat,145,27,0	warp	gefeniawarp009	1,1,gefenia04.gat,130,272
-gefenia03.gat,267,236,0	warp	gefeniawarp008	1,1,gefenia02.gat,22,237
-gefenia03.gat,269,168,0	warp	gefeniawarp006	1,1,gefenia02.gat,20,175
-gefenia04.gat,130,275,0	warp	gefeniawarp010	1,1,gefenia03.gat,145,30
-gefenia04.gat,33,273,0	warp	gefeniawarp012	1,1,gefenia03.gat,58,29
-gefenia04.gat,287,95,0	warp	gefeniawarp013	1,1,gefenia01.gat,40,103
-
+gefenia01,37,103,0	warp	gefeniawarp014	1,1,gefenia04,283,95
+gefenia01,199,269,0	warp	gefeniawarp001	1,1,gefenia02,203,34
+gefenia01,220,256,0	warp	gefeniawarp003	1,1,gefenia02,240,23
+gefenia02,17,175,0	warp	gefeniawarp005	1,1,gefenia03,266,168
+gefenia02,19,237,0	warp	gefeniawarp007	1,1,gefenia03,264,236
+gefenia02,203,31,0	warp	gefeniawarp002	1,1,gefenia01,199,266
+gefenia02,240,20,0	warp	gefeniawarp004	1,1,gefenia01,223,256
+gefenia03,58,26,0	warp	gefeniawarp011	1,1,gefenia04,33,270
+gefenia03,145,27,0	warp	gefeniawarp009	1,1,gefenia04,130,272
+gefenia03,267,236,0	warp	gefeniawarp008	1,1,gefenia02,22,237
+gefenia03,269,168,0	warp	gefeniawarp006	1,1,gefenia02,20,175
+gefenia04,130,275,0	warp	gefeniawarp010	1,1,gefenia03,145,30
+gefenia04,33,273,0	warp	gefeniawarp012	1,1,gefenia03,58,29
+gefenia04,287,95,0	warp	gefeniawarp013	1,1,gefenia01,40,103
diff --git a/npc/warps/fields/geffen_fild.txt b/npc/warps/fields/geffen_fild.txt
index eb04cac3a..f28e6baba 100644
--- a/npc/warps/fields/geffen_fild.txt
+++ b/npc/warps/fields/geffen_fild.txt
@@ -13,60 +13,60 @@
 //============================================================
 
 //= Geffen Field Warps =======================================
-gef_fild00.gat,267,382,0	warp	gef007	4,2,mjolnir_06.gat,265,32
-gef_fild00.gat,381,137,0	warp	gef008	3,9,prt_fild00.gat,24,125
-gef_fild00.gat,40,199,0	warp	gef009	2,7,geffen.gat,213,119
-gef_fild01.gat,382,111,0	warp	gef010	2,9,prt_fild04.gat,20,114
-gef_fild01.gat,16,102,0	warp	geff01	2,4,gef_fild09.gat,368,92
-gef_fild01.gat,69,17,0	warp	geff02	4,2,gef_fild03.gat,66,379
-gef_fild02.gat,380,156,0	warp	gef011	3,7,prt_fild07.gat,21,143
-gef_fild02.gat,380,289,0	warp	gef012	3,12,prt_fild07.gat,18,289
-gef_fild02.gat,380,68,0	warp	gef013	3,10,prt_fild07.gat,17,64
-gef_fild02.gat,266,18,0	warp	gef026	5,2,prt_fild10.gat,227,296
-gef_fild02.gat,14,78,0	warp	geff03	2,4,gef_fild03.gat,379,77
-gef_fild02.gat,16,275,0	warp	geff04	2,4,gef_fild03.gat,379,277
-gef_fild03.gat,312,16,0	warp	gef014	5,2,prt_fild11.gat,302,298
-gef_fild03.gat,66,382,0	warp	geff02-1	4,2,gef_fild01.gat,69,20
-gef_fild03.gat,382,77,0	warp	geff03-1	2,4,gef_fild02.gat,17,78
-gef_fild03.gat,382,277,0	warp	geff04-1	2,4,gef_fild02.gat,19,275
-gef_fild03.gat,18,52,0	warp	geff05	2,4,gef_fild10.gat,367,56
-gef_fild04.gat,187,39,0	warp	gef015	4,2,geffen.gat,119,210
-gef_fild04.gat,261,362,0	warp	gef016	4,2,mjolnir_01.gat,284,21
-gef_fild04.gat,362,322,0	warp	gef017	2,4,mjolnir_06.gat,21,331
-gef_fild04.gat,16,309,0	warp	geff06	2,6,gef_fild05.gat,361,309
-gef_fild05.gat,364,309,0	warp	geff06-1	2,8,gef_fild04.gat,19,309
-gef_fild05.gat,15,201,0	warp	geff07	2,4,gef_fild06.gat,379,211
-gef_fild05.gat,64,15,0	warp	geff08	4,2,gef_fild07.gat,64,360
-gef_fild06.gat,382,211,0	warp	geff07-1	2,4,gef_fild05.gat,18,201
-gef_fild06.gat,218,17,0	warp	geff09	4,2,gef_fild08.gat,200,352
-gef_fild07.gat,339,187,0	warp	gef025	2,4,geffen.gat,29,119
-gef_fild07.gat,64,363,0	warp	geff08-1	4,2,gef_fild05.gat,64,18
-gef_fild07.gat,18,191,0	warp	geff10	2,4,gef_fild08.gat,357,187
-gef_fild07.gat,40,19,0	warp	geff13	1,1,gef_fild13.gat,41,369
-gef_fild08.gat,200,355,0	warp	geff09-1	4,2,gef_fild06.gat,218,20
-gef_fild08.gat,360,187,0	warp	geff10-1	2,4,gef_fild07.gat,21,191
-gef_fild08.gat,215,18,0	warp	geff14	1,1,gef_fild12.gat,221,369
-gef_fild09.gat,23,56,0	warp	geff18-1	1,1,gef_fild13.gat,376,56
-gef_fild09.gat,225,25,0	warp	geff11	3,2,gef_fild10.gat,251,368
-gef_fild09.gat,368,95,0	warp	geff01-1	4,2,gef_fild01.gat,19,102
-gef_fild10.gat,251,371,0	warp	geff11-1	5,2,gef_fild09.gat,225,28
-gef_fild10.gat,104,21,0	warp	geff12	5,2,gef_fild11.gat,114,360
-gef_fild10.gat,370,56,0	warp	geff05-1	2,5,gef_fild03.gat,21,52
-gef_fild10.gat,136,331,0	warp	gef018	1,1,in_orcs01.gat,122,171
-gef_fild10.gat,138,284,0	warp	gef019	1,1,in_orcs01.gat,29,114
-gef_fild10.gat,215,51,0	warp	gef020	1,1,in_orcs01.gat,162,53
-gef_fild10.gat,223,205,0	warp	gef021	1,1,in_orcs01.gat,108,89
-gef_fild10.gat,63,337,0	warp	gef022	1,1,in_orcs01.gat,30,157
-gef_fild10.gat,27,219,0	warp	geff19-1	1,1,gef_fild14.gat,367,219
-gef_fild11.gat,377,293,0	warp	gef023	2,4,prt_fild11.gat,20,281
-gef_fild11.gat,111,364,0	warp	geff12-1	6,3,gef_fild10.gat,104,24
-gef_fild12.gat,221,374,0	warp	geff14-1	1,1,gef_fild08.gat,215,25
-gef_fild12.gat,368,180,0	warp	geff15	1,1,gef_fild13.gat,29,202
-gef_fild12.gat,372,50,0	warp	geff16	1,1,gef_fild13.gat,29,59
-gef_fild13.gat,200,25,0	warp	geff17	1,1,gef_fild14.gat,180,357
-gef_fild13.gat,25,202,0	warp	geff15-1	1,1,gef_fild12.gat,364,180
-gef_fild13.gat,26,59,0	warp	geff16-1	1,1,gef_fild12.gat,370,50
-gef_fild13.gat,380,56,0	warp	geff18	1,1,gef_fild09.gat,27,56
-gef_fild13.gat,41,373,0	warp	geff13-1	1,1,gef_fild07.gat,40,23
-gef_fild14.gat,180,360,0	warp	geff17-1	1,1,gef_fild13.gat,200,29
-gef_fild14.gat,371,219,0	warp	geff19	1,1,gef_fild10.gat,31,219
\ No newline at end of file
+gef_fild00,267,382,0	warp	gef007	4,2,mjolnir_06,265,32
+gef_fild00,381,137,0	warp	gef008	3,9,prt_fild00,24,125
+gef_fild00,40,199,0	warp	gef009	2,7,geffen,213,119
+gef_fild01,382,111,0	warp	gef010	2,9,prt_fild04,20,114
+gef_fild01,16,102,0	warp	geff01	2,4,gef_fild09,368,92
+gef_fild01,69,17,0	warp	geff02	4,2,gef_fild03,66,379
+gef_fild02,380,156,0	warp	gef011	3,7,prt_fild07,21,143
+gef_fild02,380,289,0	warp	gef012	3,12,prt_fild07,18,289
+gef_fild02,380,68,0	warp	gef013	3,10,prt_fild07,17,64
+gef_fild02,266,18,0	warp	gef026	5,2,prt_fild10,227,296
+gef_fild02,14,78,0	warp	geff03	2,4,gef_fild03,379,77
+gef_fild02,16,275,0	warp	geff04	2,4,gef_fild03,379,277
+gef_fild03,312,16,0	warp	gef014	5,2,prt_fild11,302,298
+gef_fild03,66,382,0	warp	geff02-1	4,2,gef_fild01,69,20
+gef_fild03,382,77,0	warp	geff03-1	2,4,gef_fild02,17,78
+gef_fild03,382,277,0	warp	geff04-1	2,4,gef_fild02,19,275
+gef_fild03,18,52,0	warp	geff05	2,4,gef_fild10,367,56
+gef_fild04,187,39,0	warp	gef015	4,2,geffen,119,210
+gef_fild04,261,362,0	warp	gef016	4,2,mjolnir_01,284,21
+gef_fild04,362,322,0	warp	gef017	2,4,mjolnir_06,21,331
+gef_fild04,16,309,0	warp	geff06	2,6,gef_fild05,361,309
+gef_fild05,364,309,0	warp	geff06-1	2,8,gef_fild04,19,309
+gef_fild05,15,201,0	warp	geff07	2,4,gef_fild06,379,211
+gef_fild05,64,15,0	warp	geff08	4,2,gef_fild07,64,360
+gef_fild06,382,211,0	warp	geff07-1	2,4,gef_fild05,18,201
+gef_fild06,218,17,0	warp	geff09	4,2,gef_fild08,200,352
+gef_fild07,339,187,0	warp	gef025	2,4,geffen,29,119
+gef_fild07,64,363,0	warp	geff08-1	4,2,gef_fild05,64,18
+gef_fild07,18,191,0	warp	geff10	2,4,gef_fild08,357,187
+gef_fild07,40,19,0	warp	geff13	1,1,gef_fild13,41,369
+gef_fild08,200,355,0	warp	geff09-1	4,2,gef_fild06,218,20
+gef_fild08,360,187,0	warp	geff10-1	2,4,gef_fild07,21,191
+gef_fild08,215,18,0	warp	geff14	1,1,gef_fild12,221,369
+gef_fild09,23,56,0	warp	geff18-1	1,1,gef_fild13,376,56
+gef_fild09,225,25,0	warp	geff11	3,2,gef_fild10,251,368
+gef_fild09,368,95,0	warp	geff01-1	4,2,gef_fild01,19,102
+gef_fild10,251,371,0	warp	geff11-1	5,2,gef_fild09,225,28
+gef_fild10,104,21,0	warp	geff12	5,2,gef_fild11,114,360
+gef_fild10,370,56,0	warp	geff05-1	2,5,gef_fild03,21,52
+gef_fild10,136,331,0	warp	gef018	1,1,in_orcs01,122,171
+gef_fild10,138,284,0	warp	gef019	1,1,in_orcs01,29,114
+gef_fild10,215,51,0	warp	gef020	1,1,in_orcs01,162,53
+gef_fild10,223,205,0	warp	gef021	1,1,in_orcs01,108,89
+gef_fild10,63,337,0	warp	gef022	1,1,in_orcs01,30,157
+gef_fild10,27,219,0	warp	geff19-1	1,1,gef_fild14,367,219
+gef_fild11,377,293,0	warp	gef023	2,4,prt_fild11,20,281
+gef_fild11,111,364,0	warp	geff12-1	6,3,gef_fild10,104,24
+gef_fild12,221,374,0	warp	geff14-1	1,1,gef_fild08,215,25
+gef_fild12,368,180,0	warp	geff15	1,1,gef_fild13,29,202
+gef_fild12,372,50,0	warp	geff16	1,1,gef_fild13,29,59
+gef_fild13,200,25,0	warp	geff17	1,1,gef_fild14,180,357
+gef_fild13,25,202,0	warp	geff15-1	1,1,gef_fild12,364,180
+gef_fild13,26,59,0	warp	geff16-1	1,1,gef_fild12,370,50
+gef_fild13,380,56,0	warp	geff18	1,1,gef_fild09,27,56
+gef_fild13,41,373,0	warp	geff13-1	1,1,gef_fild07,40,23
+gef_fild14,180,360,0	warp	geff17-1	1,1,gef_fild13,200,29
+gef_fild14,371,219,0	warp	geff19	1,1,gef_fild10,31,219
\ No newline at end of file
diff --git a/npc/warps/fields/glastheim.txt b/npc/warps/fields/glastheim.txt
index 753492798..ad4310dd8 100644
--- a/npc/warps/fields/glastheim.txt
+++ b/npc/warps/fields/glastheim.txt
@@ -14,71 +14,71 @@
 //============================================================
 
 //Glastheim
-gef_fild06.gat,20,304,0	warp	gef027	3,3,glast_01.gat,370,304
-gl_cas01.gat,135,40,0	warp	gl01	1,1,gl_cas01.gat,144,314
-gl_cas01.gat,149,314,0	warp	gl02	1,1,gl_prison.gat,14,70
-gl_cas01.gat,167,191,0	warp	gl03	1,1,gl_prison.gat,14,70
-gl_cas01.gat,185,236,0	warp	gl06	1,1,gl_cas01.gat,163,191
-gl_cas01.gat,200,165,0	warp	gl10	1,1,gl_cas02.gat,104,25
-gl_cas01.gat,200,18,0	warp	gl7-1	2,2,glast_01.gat,200,294
-gl_cas01.gat,215,236,0	warp	gl07	1,1,gl_cas01.gat,238,192
-gl_cas01.gat,234,192,0	warp	gl04	1,1,gl_prison.gat,14,70
-gl_cas01.gat,371,301,0	warp	gl05	1,1,gl_prison.gat,14,70
-gl_cas01.gat,372,39,0	warp	gl08	1,1,gl_cas01.gat,367,301
-gl_cas02.gat,104,15,0	warp	gl10-1	1,1,gl_cas01.gat,200,160
-gl_cas02.gat,104,193,0	warp	gl8-1	1,1,glast_01.gat,199,325
-gl_church.gat,156,4,0	warp	gl9-1	1,1,glast_01.gat,200,134
-gl_church.gat,16,299,0	warp	gl11	1,1,gl_chyard.gat,147,284
-gl_church.gat,301,46,0	warp	gl12	1,1,gl_chyard.gat,147,15
-gl_chyard.gat,12,149,0	warp	gl22	1,1,gl_sew02.gat,29,270
-gl_chyard.gat,147,12,0	warp	gl12-1	1,1,gl_church.gat,295,46
-gl_chyard.gat,147,287,0	warp	gl11-1	1,1,gl_church.gat,16,295
-gl_dun01.gat,133,277,0	warp	gl25-1	1,1,gl_sew04.gat,101,78
-gl_dun01.gat,225,18,0	warp	gl13	1,1,gl_dun02.gat,224,274
-gl_dun02.gat,224,277,0	warp	gl13-1	1,1,gl_dun01.gat,225,22
-gl_in01.gat,106,125,0	warp	gl5-1	1,1,glast_01.gat,219,357
-gl_in01.gat,118,59,0	warp	gl6-1	1,1,glast_01.gat,234,330
-gl_in01.gat,81,68,0	warp	gl3-1	1,1,glast_01.gat,165,330
-gl_in01.gat,83,174,0	warp	gl4-1	1,1,glast_01.gat,181,357
-gl_knt01.gat,104,204,0	warp	gl15	1,1,gl_knt01.gat,123,292
-gl_knt01.gat,12,148,0	warp	gl14	1,1,gl_knt02.gat,15,140
-gl_knt01.gat,128,292,0	warp	gl15-1	1,1,gl_knt01.gat,104,199
-gl_knt01.gat,150,291,0	warp	gl16	1,1,gl_knt02.gat,157,287
-gl_knt01.gat,150,6,0	warp	gl2-1	2,2,glast_01.gat,74,193
-gl_knt01.gat,231,197,0	warp	gl24-1	1,1,gl_sew02.gat,296,22
-gl_knt01.gat,287,144,0	warp	gl17	1,1,gl_knt02.gat,283,140
-gl_knt02.gat,10,138,0	warp	gl14-1	1,1,gl_knt01.gat,7,148
-gl_knt02.gat,157,292,0	warp	gl16-1	1,1,gl_knt01.gat,150,286
-gl_knt02.gat,289,138,0	warp	gl17-1	1,1,gl_knt01.gat,292,144
-gl_prison.gat,149,183,0	warp	gl18-1	1,1,gl_prison1.gat,150,14
-gl_prison.gat,10,70,4	script	gl18-2	45,1,1,{
+gef_fild06,20,304,0	warp	gef027	3,3,glast_01,370,304
+gl_cas01,135,40,0	warp	gl01	1,1,gl_cas01,144,314
+gl_cas01,149,314,0	warp	gl02	1,1,gl_prison,14,70
+gl_cas01,167,191,0	warp	gl03	1,1,gl_prison,14,70
+gl_cas01,185,236,0	warp	gl06	1,1,gl_cas01,163,191
+gl_cas01,200,165,0	warp	gl10	1,1,gl_cas02,104,25
+gl_cas01,200,18,0	warp	gl7-1	2,2,glast_01,200,294
+gl_cas01,215,236,0	warp	gl07	1,1,gl_cas01,238,192
+gl_cas01,234,192,0	warp	gl04	1,1,gl_prison,14,70
+gl_cas01,371,301,0	warp	gl05	1,1,gl_prison,14,70
+gl_cas01,372,39,0	warp	gl08	1,1,gl_cas01,367,301
+gl_cas02,104,15,0	warp	gl10-1	1,1,gl_cas01,200,160
+gl_cas02,104,193,0	warp	gl8-1	1,1,glast_01,199,325
+gl_church,156,4,0	warp	gl9-1	1,1,glast_01,200,134
+gl_church,16,299,0	warp	gl11	1,1,gl_chyard,147,284
+gl_church,301,46,0	warp	gl12	1,1,gl_chyard,147,15
+gl_chyard,12,149,0	warp	gl22	1,1,gl_sew02,29,270
+gl_chyard,147,12,0	warp	gl12-1	1,1,gl_church,295,46
+gl_chyard,147,287,0	warp	gl11-1	1,1,gl_church,16,295
+gl_dun01,133,277,0	warp	gl25-1	1,1,gl_sew04,101,78
+gl_dun01,225,18,0	warp	gl13	1,1,gl_dun02,224,274
+gl_dun02,224,277,0	warp	gl13-1	1,1,gl_dun01,225,22
+gl_in01,106,125,0	warp	gl5-1	1,1,glast_01,219,357
+gl_in01,118,59,0	warp	gl6-1	1,1,glast_01,234,330
+gl_in01,81,68,0	warp	gl3-1	1,1,glast_01,165,330
+gl_in01,83,174,0	warp	gl4-1	1,1,glast_01,181,357
+gl_knt01,104,204,0	warp	gl15	1,1,gl_knt01,123,292
+gl_knt01,12,148,0	warp	gl14	1,1,gl_knt02,15,140
+gl_knt01,128,292,0	warp	gl15-1	1,1,gl_knt01,104,199
+gl_knt01,150,291,0	warp	gl16	1,1,gl_knt02,157,287
+gl_knt01,150,6,0	warp	gl2-1	2,2,glast_01,74,193
+gl_knt01,231,197,0	warp	gl24-1	1,1,gl_sew02,296,22
+gl_knt01,287,144,0	warp	gl17	1,1,gl_knt02,283,140
+gl_knt02,10,138,0	warp	gl14-1	1,1,gl_knt01,7,148
+gl_knt02,157,292,0	warp	gl16-1	1,1,gl_knt01,150,286
+gl_knt02,289,138,0	warp	gl17-1	1,1,gl_knt01,292,144
+gl_prison,149,183,0	warp	gl18-1	1,1,gl_prison1,150,14
+gl_prison,10,70,4	script	gl18-2	45,1,1,{
 if(rand(2)==1) goto w2;
 	warp "gl_cas01",236,192; end;
 w2: warp "gl_cas01",164,191; end;
 }
-gl_prison1.gat,150,10,0	warp	gl18	1,1,gl_prison.gat,149,178
-gl_prison1.gat,62,187,0	warp	gl10	1,1,gl_sew01.gat,258,255
-gl_sew01.gat,19,21,0	warp	gl19	1,1,gl_sew02.gat,108,291
-gl_sew01.gat,258,258,0	warp	gl09	1,1,gl_prison1.gat,61,183
-gl_sew02.gat,109,294,0	warp	gl19-1	1,1,gl_sew01.gat,19,24
-gl_sew02.gat,16,26,0	warp	gl11	1,1,gl_prison1.gat,61,183
-gl_sew02.gat,290,156,0	warp	gl23	1,1,gl_step.gat,117,124
-gl_sew02.gat,296,18,0	warp	gl24	1,1,gl_knt01.gat,231,192
-gl_sew02.gat,299,294,0	warp	gl20	1,1,gl_sew03.gat,171,283
-gl_sew02.gat,30,273,0	warp	gl22-1	1,1,gl_chyard.gat,15,149
-gl_sew03.gat,171,286,0	warp	gl20-1	1,1,gl_sew02.gat,295,294
-gl_sew03.gat,64,10,0	warp	gl21	1,1,gl_sew04.gat,68,277
-gl_sew04.gat,104,78,0	warp	gl25	1,1,gl_dun01.gat,133,271
-gl_sew04.gat,68,280,0	warp	gl21-1	1,1,gl_sew03.gat,64,13
-gl_step.gat,120,124,0	warp	gl23-1	1,1,gl_sew02.gat,285,158
-gl_step.gat,8,7,0	warp	gl1-1	1,1,glast_01.gat,54,108
-glast_01.gat,162,330,0	warp	gl3	1,1,gl_in01.gat,77,68
-glast_01.gat,179,360,0	warp	gl4	1,1,gl_in01.gat,80,174
-glast_01.gat,199,322,0	warp	gl8	1,1,gl_cas02.gat,104,189
-glast_01.gat,200,137,0	warp	gl9	1,1,gl_church.gat,156,7
-glast_01.gat,200,297,0	warp	gl7	1,1,gl_cas01.gat,199,29
-glast_01.gat,220,360,0	warp	gl5	1,1,gl_in01.gat,110,125
-glast_01.gat,237,330,0	warp	gl6	1,1,gl_in01.gat,122,59
-glast_01.gat,377,304,0	warp	glst001	3,3,gef_fild06.gat,27,304
-glast_01.gat,51,108,0	warp	gl1	1,1,gl_step.gat,12,7
-glast_01.gat,77,193,0	warp	gl2	1,1,gl_knt01.gat,150,15
\ No newline at end of file
+gl_prison1,150,10,0	warp	gl18	1,1,gl_prison,149,178
+gl_prison1,62,187,0	warp	gl10	1,1,gl_sew01,258,255
+gl_sew01,19,21,0	warp	gl19	1,1,gl_sew02,108,291
+gl_sew01,258,258,0	warp	gl09	1,1,gl_prison1,61,183
+gl_sew02,109,294,0	warp	gl19-1	1,1,gl_sew01,19,24
+gl_sew02,16,26,0	warp	gl11	1,1,gl_prison1,61,183
+gl_sew02,290,156,0	warp	gl23	1,1,gl_step,117,124
+gl_sew02,296,18,0	warp	gl24	1,1,gl_knt01,231,192
+gl_sew02,299,294,0	warp	gl20	1,1,gl_sew03,171,283
+gl_sew02,30,273,0	warp	gl22-1	1,1,gl_chyard,15,149
+gl_sew03,171,286,0	warp	gl20-1	1,1,gl_sew02,295,294
+gl_sew03,64,10,0	warp	gl21	1,1,gl_sew04,68,277
+gl_sew04,104,78,0	warp	gl25	1,1,gl_dun01,133,271
+gl_sew04,68,280,0	warp	gl21-1	1,1,gl_sew03,64,13
+gl_step,120,124,0	warp	gl23-1	1,1,gl_sew02,285,158
+gl_step,8,7,0	warp	gl1-1	1,1,glast_01,54,108
+glast_01,162,330,0	warp	gl3	1,1,gl_in01,77,68
+glast_01,179,360,0	warp	gl4	1,1,gl_in01,80,174
+glast_01,199,322,0	warp	gl8	1,1,gl_cas02,104,189
+glast_01,200,137,0	warp	gl9	1,1,gl_church,156,7
+glast_01,200,297,0	warp	gl7	1,1,gl_cas01,199,29
+glast_01,220,360,0	warp	gl5	1,1,gl_in01,110,125
+glast_01,237,330,0	warp	gl6	1,1,gl_in01,122,59
+glast_01,377,304,0	warp	glst001	3,3,gef_fild06,27,304
+glast_01,51,108,0	warp	gl1	1,1,gl_step,12,7
+glast_01,77,193,0	warp	gl2	1,1,gl_knt01,150,15
\ No newline at end of file
diff --git a/npc/warps/fields/hugel_fild.txt b/npc/warps/fields/hugel_fild.txt
index 925297e87..102d6386a 100644
--- a/npc/warps/fields/hugel_fild.txt
+++ b/npc/warps/fields/hugel_fild.txt
@@ -13,33 +13,33 @@
 //============================================================
 
 //= Hugel Field ================================================
-ein_fild04.gat,344,294,0	warp	hugel001	1,1,ein_fild05.gat,77,294
-ein_fild05.gat,75,294,0	warp	hugel001a	1,1,ein_fild04.gat,339,294
-ein_fild05.gat,377,183,0	warp	hugel002	1,1,ein_fild06.gat,42,169
-ein_fild06.gat,40,169,0	warp	hugel002a	1,1,ein_fild05.gat,375,183
-ein_fild02.gat,358,250,0	warp	hugel003	1,1,yuno_fild04.gat,34,281
-yuno_fild04.gat,32,281,0	warp	hugel003a	1,1,ein_fild02.gat,356,250
-ein_fild01.gat,350,369,0	warp	hugel003	1,1,yuno_fild05.gat,40,349
-yuno_fild05.gat,40,351,0	warp	hugel003a	1,1,ein_fild01.gat,348,369
-ein_fild01.gat,107,34,0	warp	hugel004	1,1,ein_fild02.gat,107,363
-ein_fild02.gat,107,365,0	warp	hugel004a	1,1,ein_fild01.gat,107,36
-ein_fild01.gat,234,34,0	warp	hugel005	1,1,ein_fild02.gat,256,348
-ein_fild02.gat,256,350,0	warp	hugel005a	1,1,ein_fild01.gat,234,36
-ein_fild02.gat,170,30,0	warp	hugel006	1,1,ein_fild05.gat,174,372
-ein_fild05.gat,174,374,0	warp	hugel006a	1,1,ein_fild02.gat,170,32
-hu_fild01.gat,367,182,0	warp	hugel007	1,1,hu_fild02.gat,18,167
-hu_fild02.gat,16,167,0	warp	hugel007a	1,1,hu_fild01.gat,365,182
-hu_fild04.gat,47,373,0	warp	hugel008	1,1,hu_fild02.gat,41,23
-hu_fild02.gat,41,21,0	warp	hugel008a	1,1,hu_fild04.gat,47,371
-hu_fild04.gat,296,380,0	warp	hugel009	1,1,hu_fild02.gat,291,29
-hu_fild02.gat,291,27,0	warp	hugel009a	1,1,hu_fild04.gat,296,378
-hu_fild05.gat,286,357,0	warp	hugel010	1,1,hu_fild03.gat,289,22
-hu_fild03.gat,289,20,0	warp	hugel010a	1,1,hu_fild05.gat,286,355
-hu_fild05.gat,353,125,0	warp	hugel011	1,1,hu_fild06.gat,29,118
-hu_fild06.gat,27,118,0	warp	hugel011a	1,1,hu_fild05.gat,351,125
-hu_fild02.gat,375,338,0	warp	hugel012	1,1,hu_fild03.gat,21,339
-hu_fild03.gat,19,339,0	warp	hugel012a	1,1,hu_fild02.gat,373,338
-hu_fild02.gat,378,153,0	warp	hugel013	1,1,hu_fild03.gat,26,166
-hu_fild03.gat,24,166,0	warp	hugel013a	1,1,hu_fild02.gat,376,153
-yuno_fild09.gat,377,182,0	warp	hugel014	1,1,yuno_fild10.gat,40,183
-yuno_fild10.gat,38,183,0	warp	hugel014a	1,1,yuno_fild09.gat,375,182
\ No newline at end of file
+ein_fild04,344,294,0	warp	hugel001	1,1,ein_fild05,77,294
+ein_fild05,75,294,0	warp	hugel001a	1,1,ein_fild04,339,294
+ein_fild05,377,183,0	warp	hugel002	1,1,ein_fild06,42,169
+ein_fild06,40,169,0	warp	hugel002a	1,1,ein_fild05,375,183
+ein_fild02,358,250,0	warp	hugel003	1,1,yuno_fild04,34,281
+yuno_fild04,32,281,0	warp	hugel003a	1,1,ein_fild02,356,250
+ein_fild01,350,369,0	warp	hugel003	1,1,yuno_fild05,40,349
+yuno_fild05,40,351,0	warp	hugel003a	1,1,ein_fild01,348,369
+ein_fild01,107,34,0	warp	hugel004	1,1,ein_fild02,107,363
+ein_fild02,107,365,0	warp	hugel004a	1,1,ein_fild01,107,36
+ein_fild01,234,34,0	warp	hugel005	1,1,ein_fild02,256,348
+ein_fild02,256,350,0	warp	hugel005a	1,1,ein_fild01,234,36
+ein_fild02,170,30,0	warp	hugel006	1,1,ein_fild05,174,372
+ein_fild05,174,374,0	warp	hugel006a	1,1,ein_fild02,170,32
+hu_fild01,367,182,0	warp	hugel007	1,1,hu_fild02,18,167
+hu_fild02,16,167,0	warp	hugel007a	1,1,hu_fild01,365,182
+hu_fild04,47,373,0	warp	hugel008	1,1,hu_fild02,41,23
+hu_fild02,41,21,0	warp	hugel008a	1,1,hu_fild04,47,371
+hu_fild04,296,380,0	warp	hugel009	1,1,hu_fild02,291,29
+hu_fild02,291,27,0	warp	hugel009a	1,1,hu_fild04,296,378
+hu_fild05,286,357,0	warp	hugel010	1,1,hu_fild03,289,22
+hu_fild03,289,20,0	warp	hugel010a	1,1,hu_fild05,286,355
+hu_fild05,353,125,0	warp	hugel011	1,1,hu_fild06,29,118
+hu_fild06,27,118,0	warp	hugel011a	1,1,hu_fild05,351,125
+hu_fild02,375,338,0	warp	hugel012	1,1,hu_fild03,21,339
+hu_fild03,19,339,0	warp	hugel012a	1,1,hu_fild02,373,338
+hu_fild02,378,153,0	warp	hugel013	1,1,hu_fild03,26,166
+hu_fild03,24,166,0	warp	hugel013a	1,1,hu_fild02,376,153
+yuno_fild09,377,182,0	warp	hugel014	1,1,yuno_fild10,40,183
+yuno_fild10,38,183,0	warp	hugel014a	1,1,yuno_fild09,375,182
\ No newline at end of file
diff --git a/npc/warps/fields/jawaii.txt b/npc/warps/fields/jawaii.txt
index 20b8e2c59..04e9aeb07 100644
--- a/npc/warps/fields/jawaii.txt
+++ b/npc/warps/fields/jawaii.txt
@@ -16,11 +16,11 @@
 //= 1.2b Added a missing warp [Komurka]
 //============================================================
 
-jawaii_in.gat,90,78,0	warp	jawaiiwarp001	1,1,jawaii.gat,115,172
-jawaii_in.gat,113,61,0	warp	jawaiiwarp002	1,1,jawaii.gat,138,202
-jawaii_in.gat,133,107,0	warp	jawaiiwarp003	1,1,jawaii.gat,111,199
-jawaii_in.gat,88,117,0	warp	jawaiiwarp004	1,1,jawaii.gat,109,186
-jawaii.gat,192,215,0	warp	jawaiiwarp005	1,1,jawaii_in.gat,28,94
-jawaii_in.gat,27,91,4	script	jawaiiwarp006	45,1,1,{
-if (getpartnerid() > 0) warp "jawaii.gat",192,218; else warp "jawaii_in.gat",27,94;
+jawaii_in,90,78,0	warp	jawaiiwarp001	1,1,jawaii,115,172
+jawaii_in,113,61,0	warp	jawaiiwarp002	1,1,jawaii,138,202
+jawaii_in,133,107,0	warp	jawaiiwarp003	1,1,jawaii,111,199
+jawaii_in,88,117,0	warp	jawaiiwarp004	1,1,jawaii,109,186
+jawaii,192,215,0	warp	jawaiiwarp005	1,1,jawaii_in,28,94
+jawaii_in,27,91,4	script	jawaiiwarp006	45,1,1,{
+if (getpartnerid() > 0) warp "jawaii",192,218; else warp "jawaii_in",27,94;
 }
\ No newline at end of file
diff --git a/npc/warps/fields/lhalzen_fild.txt b/npc/warps/fields/lhalzen_fild.txt
index 7fe640fc0..7653af316 100644
--- a/npc/warps/fields/lhalzen_fild.txt
+++ b/npc/warps/fields/lhalzen_fild.txt
@@ -13,8 +13,8 @@
 //= 1.2 Updated the warp, according to korean eA site [Vicious]
 //============================================================
 
-lhz_fild01.gat,210,18,0	warp	lhz043	1,1,lighthalzen.gat,214,324
-lighthalzen.gat,214,329,0	warp	lhz043a	1,1,lhz_fild01.gat,210,23
+lhz_fild01,210,18,0	warp	lhz043	1,1,lighthalzen,214,324
+lighthalzen,214,329,0	warp	lhz043a	1,1,lhz_fild01,210,23
 
-lhz_fild01.gat,367,222,0	warp	lhz044	1,1,lhz_fild02.gat,36,221
-lhz_fild02.gat,29,219,0	warp	lhz044a	1,1,lhz_fild01.gat,361,222
\ No newline at end of file
+lhz_fild01,367,222,0	warp	lhz044	1,1,lhz_fild02,36,221
+lhz_fild02,29,219,0	warp	lhz044a	1,1,lhz_fild01,361,222
\ No newline at end of file
diff --git a/npc/warps/fields/lutie_fild.txt b/npc/warps/fields/lutie_fild.txt
index 38a14d7da..40c24bd49 100644
--- a/npc/warps/fields/lutie_fild.txt
+++ b/npc/warps/fields/lutie_fild.txt
@@ -13,5 +13,5 @@
 //============================================================
 
 //= Lutie Field ==============================================
-xmas_fild01.gat,80,251,0	warp	xmas2	2,2,xmas.gat,150,45
-xmas_fild01.gat,85,49,0	warp	xmas001	10,3,aldebaran.gat,140,240
+xmas_fild01,80,251,0	warp	xmas2	2,2,xmas,150,45
+xmas_fild01,85,49,0	warp	xmas001	10,3,aldebaran,140,240
\ No newline at end of file
diff --git a/npc/warps/fields/morroc_fild.txt b/npc/warps/fields/morroc_fild.txt
index 39e4e3b35..30e277183 100644
--- a/npc/warps/fields/morroc_fild.txt
+++ b/npc/warps/fields/morroc_fild.txt
@@ -13,91 +13,91 @@
 //============================================================
 
 //= Sograt Dessert ===========================================
-moc_fild01.gat,101,16,0	warp	mocf01-1	15,3,moc_fild04.gat,317,376
-moc_fild01.gat,22,242,0	warp	mocf005	2,2,prt_fild09.gat,380,237
-moc_fild01.gat,239,382,0	warp	mocf006	12,1,prt_fild08.gat,233,20
-moc_fild01.gat,301,16,0	warp	mocf02	10,1,moc_fild02.gat,77,338
-moc_fild01.gat,321,16,0	warp	mocf02-1	10,1,moc_fild02.gat,77,338
-moc_fild01.gat,341,16,0	warp	mocf02-2	10,1,moc_fild02.gat,77,338
-moc_fild01.gat,379,162,0	warp	mocf011	2,12,pay_fild04.gat,20,165
-moc_fild01.gat,56,384,0	warp	moc007	3,2,prt_fild08.gat,54,24
-moc_fild01.gat,68,16,0	warp	mocf01	15,3,moc_fild04.gat,317,376
-moc_fild02.gat,228,29,0	warp	mocf03	4,2,moc_fild13.gat,298,367
-moc_fild02.gat,332,19,0	warp	mocf04	5,3,moc_fild03.gat,70,336
-moc_fild02.gat,350,339,0	warp	mocf012	6,2,pay_fild04.gat,194,20
-moc_fild02.gat,67,342,0	warp	mocf02-3	11,3,moc_fild01.gat,315,25
-moc_fild02.gat,71,18,0	warp	mocf05	4,2,moc_fild13.gat,146,365
-moc_fild02.gat,92,342,0	warp	mocf02-4	11,3,moc_fild01.gat,315,25
-moc_fild03.gat,17,37,0	warp	mocf06	2,4,moc_fild13.gat,305,49
-moc_fild03.gat,179,16,0	warp	mocf013	4,2,pay_fild11.gat,38,327
-moc_fild03.gat,303,170,0	warp	mocf014	2,7,pay_fild01.gat,17,152
-moc_fild03.gat,70,341,0	warp	mocf04-1	5,2,moc_fild02.gat,332,23
-moc_fild04.gat,14,122,0	warp	mocf07-1	1,11,moc_fild05.gat,378,119
-moc_fild04.gat,14,146,0	warp	mocf07-2	1,11,moc_fild05.gat,378,119
-moc_fild04.gat,14,98,0	warp	mocf07	1,11,moc_fild05.gat,378,119
-moc_fild04.gat,175,18,0	warp	mocf08	3,2,moc_fild08.gat,170,380
-moc_fild04.gat,19,206,0	warp	mocf09	3,15,moc_fild05.gat,373,208
-moc_fild04.gat,219,327,0	script	mocf016	45,3,4,{ set @anthell,0; warp "anthell01.gat",35,262; }
-moc_fild04.gat,292,381,0	warp	mocf01-2	10,1,moc_fild01.gat,76,25
-moc_fild04.gat,314,381,0	warp	mocf01-3	10,1,moc_fild01.gat,76,25
-moc_fild04.gat,336,381,0	warp	mocf01-4	10,1,moc_fild01.gat,76,25
-moc_fild04.gat,92,381,0	warp	mocf008	9,2,prt_fild09.gat,246,19
-moc_fild05.gat,144,375,0	warp	mocf009	11,2,prt_fild10.gat,263,23
-moc_fild05.gat,18,136,0	warp	mocf10	1,8,moc_fild06.gat,367,317
-moc_fild05.gat,18,154,0	warp	mocf10-1	1,8,moc_fild06.gat,367,317
-moc_fild05.gat,18,172,0	warp	mocf10-2	1,8,moc_fild06.gat,367,317
-moc_fild05.gat,268,18,0	warp	mocf11	4,2,moc_fild09.gat,267,368
-moc_fild05.gat,325,382,0	warp	mocf010	6,2,prt_fild09.gat,95,19
-moc_fild05.gat,378,208,0	warp	mocf09-1	3,14,moc_fild04.gat,26,206
-moc_fild05.gat,384,108,0	warp	mocf07-3	1,8,moc_fild04.gat,22,123
-moc_fild05.gat,384,126,0	warp	mocf07-4	1,8,moc_fild04.gat,22,123
-moc_fild05.gat,384,144,0	warp	mocf07-5	1,8,moc_fild04.gat,22,123
-moc_fild05.gat,82,16,0	warp	mocf12	5,2,moc_fild09.gat,80,366
-moc_fild06.gat,18,198,0	warp	mocf13	1,18,moc_fild07.gat,378,201
-moc_fild06.gat,207,18,0	warp	mocf14	11,2,moc_fild10.gat,208,295
-moc_fild06.gat,377,316,0	warp	mocf10-3	1,15,moc_fild05.gat,24,153
-moc_fild07.gat,198,21,0	warp	mocf001	2,2,morocc.gat,160,294
-moc_fild07.gat,381,201,0	warp	mocf13-1	2,16,moc_fild06.gat,28,201
-moc_fild08.gat,16,207,0	warp	mocf15	2,4,moc_fild09.gat,371,195
-moc_fild08.gat,170,383,0	warp	mocf08-1	3,2,moc_fild04.gat,175,21
-moc_fild08.gat,204,16,0	warp	mocf16	4,2,moc_fild14.gat,196,379
-moc_fild08.gat,383,211,0	warp	mocf17	2,4,moc_fild13.gat,32,171
-moc_fild09.gat,126,20,0	warp	mocf18	4,2,moc_fild15.gat,158,360
-moc_fild09.gat,267,371,0	warp	mocf11-1	4,2,moc_fild05.gat,268,21
-moc_fild09.gat,30,162,0	warp	mocf19	2,3,moc_fild10.gat,381,258
-moc_fild09.gat,374,195,0	warp	mocf15-1	2,8,moc_fild08.gat,19,207
-moc_fild09.gat,80,369,0	warp	mocf12-1	7,2,moc_fild05.gat,82,19
-moc_fild10.gat,189,23,0	warp	mocf20	3,2,moc_fild11.gat,189,360
-moc_fild10.gat,19,207,0	warp	mocf002	2,2,morocc.gat,299,207
-moc_fild10.gat,208,298,0	warp	mocf14-1	10,2,moc_fild06.gat,207,21
-moc_fild10.gat,384,258,0	warp	mocf19-1	2,3,moc_fild09.gat,33,162
-moc_fild11.gat,189,363,0	warp	mocf20-1	3,2,moc_fild10.gat,189,26
-moc_fild11.gat,212,29,0	warp	mocf21	4,2,moc_fild17.gat,218,366
-moc_fild11.gat,26,161,0	warp	mocf22	2,10,moc_fild12.gat,286,168
-moc_fild11.gat,379,197,0	warp	mocf23	2,6,moc_fild15.gat,41,105
-moc_fild12.gat,118,30,0	warp	mocf24	4,2,moc_fild18.gat,158,379
-moc_fild12.gat,159,381,0	warp	mocf003	2,2,morocc.gat,160,20
-moc_fild12.gat,289,168,0	warp	mocf22-1	2,3,moc_fild11.gat,29,161
-moc_fild13.gat,146,368,0	warp	mocf05-1	5,2,moc_fild02.gat,71,21
-moc_fild13.gat,29,171,0	warp	mocf17-1	2,4,moc_fild08.gat,380,211
-moc_fild13.gat,298,370,0	warp	mocf03-1	4,2,moc_fild02.gat,228,32
-moc_fild13.gat,308,49,0	warp	mocf06-1	2,4,moc_fild03.gat,20,37
-moc_fild14.gat,16,278,0	warp	mocf25	2,6,moc_fild15.gat,364,276
-moc_fild14.gat,196,382,0	warp	mocf16-1	4,2,moc_fild08.gat,204,19
-moc_fild15.gat,104,16,0	warp	mocf26	9,2,moc_fild16.gat,125,380
-moc_fild15.gat,158,363,0	warp	mocf18-1	6,2,moc_fild09.gat,126,23
-moc_fild15.gat,258,253,0	script	mocf017	45,3,3,{ set @anthell,1; warp "anthell01.gat",35,262; }
-moc_fild15.gat,348,18,0	warp	mocf27	5,2,moc_fild16.gat,334,379
-moc_fild15.gat,367,276,0	warp	mocf25-1	2,4,moc_fild14.gat,19,278
-moc_fild15.gat,38,105,0	warp	mocf23-1	2,4,moc_fild11.gat,376,197
-moc_fild16.gat,125,383,0	warp	mocf26-1	5,2,moc_fild15.gat,104,19
-moc_fild16.gat,16,179,0	warp	mocf28	2,6,moc_fild17.gat,366,272
-moc_fild16.gat,334,382,0	warp	mocf27-1	4,2,moc_fild15.gat,348,21
-moc_fild17.gat,218,369,0	warp	mocf21-1	5,2,moc_fild11.gat,212,32
-moc_fild17.gat,30,300,0	warp	moc29	2,5,moc_fild18.gat,379,305
-moc_fild17.gat,369,272,0	warp	mocf28-1	2,3,moc_fild16.gat,19,179
-moc_fild18.gat,158,382,0	warp	mocf24-1	4,2,moc_fild12.gat,118,33
-moc_fild18.gat,382,305,0	warp	moc29-1	2,4,moc_fild17.gat,33,300
-moc_fild19.gat,169,107,0	warp	mocf004	1,4,morocc.gat,27,164
-moc_fild19.gat,71,170,0	warp	mocf018	8,2,moc_ruins.gat,71,19
-moc_fild19.gat,98,99,0	warp	mocf019	1,1,in_sphinx1.gat,288,9
\ No newline at end of file
+moc_fild01,101,16,0	warp	mocf01-1	15,3,moc_fild04,317,376
+moc_fild01,22,242,0	warp	mocf005	2,2,prt_fild09,380,237
+moc_fild01,239,382,0	warp	mocf006	12,1,prt_fild08,233,20
+moc_fild01,301,16,0	warp	mocf02	10,1,moc_fild02,77,338
+moc_fild01,321,16,0	warp	mocf02-1	10,1,moc_fild02,77,338
+moc_fild01,341,16,0	warp	mocf02-2	10,1,moc_fild02,77,338
+moc_fild01,379,162,0	warp	mocf011	2,12,pay_fild04,20,165
+moc_fild01,56,384,0	warp	moc007	3,2,prt_fild08,54,24
+moc_fild01,68,16,0	warp	mocf01	15,3,moc_fild04,317,376
+moc_fild02,228,29,0	warp	mocf03	4,2,moc_fild13,298,367
+moc_fild02,332,19,0	warp	mocf04	5,3,moc_fild03,70,336
+moc_fild02,350,339,0	warp	mocf012	6,2,pay_fild04,194,20
+moc_fild02,67,342,0	warp	mocf02-3	11,3,moc_fild01,315,25
+moc_fild02,71,18,0	warp	mocf05	4,2,moc_fild13,146,365
+moc_fild02,92,342,0	warp	mocf02-4	11,3,moc_fild01,315,25
+moc_fild03,17,37,0	warp	mocf06	2,4,moc_fild13,305,49
+moc_fild03,179,16,0	warp	mocf013	4,2,pay_fild11,38,327
+moc_fild03,303,170,0	warp	mocf014	2,7,pay_fild01,17,152
+moc_fild03,70,341,0	warp	mocf04-1	5,2,moc_fild02,332,23
+moc_fild04,14,122,0	warp	mocf07-1	1,11,moc_fild05,378,119
+moc_fild04,14,146,0	warp	mocf07-2	1,11,moc_fild05,378,119
+moc_fild04,14,98,0	warp	mocf07	1,11,moc_fild05,378,119
+moc_fild04,175,18,0	warp	mocf08	3,2,moc_fild08,170,380
+moc_fild04,19,206,0	warp	mocf09	3,15,moc_fild05,373,208
+moc_fild04,219,327,0	script	mocf016	45,3,4,{ set @anthell,0; warp "anthell01",35,262; }
+moc_fild04,292,381,0	warp	mocf01-2	10,1,moc_fild01,76,25
+moc_fild04,314,381,0	warp	mocf01-3	10,1,moc_fild01,76,25
+moc_fild04,336,381,0	warp	mocf01-4	10,1,moc_fild01,76,25
+moc_fild04,92,381,0	warp	mocf008	9,2,prt_fild09,246,19
+moc_fild05,144,375,0	warp	mocf009	11,2,prt_fild10,263,23
+moc_fild05,18,136,0	warp	mocf10	1,8,moc_fild06,367,317
+moc_fild05,18,154,0	warp	mocf10-1	1,8,moc_fild06,367,317
+moc_fild05,18,172,0	warp	mocf10-2	1,8,moc_fild06,367,317
+moc_fild05,268,18,0	warp	mocf11	4,2,moc_fild09,267,368
+moc_fild05,325,382,0	warp	mocf010	6,2,prt_fild09,95,19
+moc_fild05,378,208,0	warp	mocf09-1	3,14,moc_fild04,26,206
+moc_fild05,384,108,0	warp	mocf07-3	1,8,moc_fild04,22,123
+moc_fild05,384,126,0	warp	mocf07-4	1,8,moc_fild04,22,123
+moc_fild05,384,144,0	warp	mocf07-5	1,8,moc_fild04,22,123
+moc_fild05,82,16,0	warp	mocf12	5,2,moc_fild09,80,366
+moc_fild06,18,198,0	warp	mocf13	1,18,moc_fild07,378,201
+moc_fild06,207,18,0	warp	mocf14	11,2,moc_fild10,208,295
+moc_fild06,377,316,0	warp	mocf10-3	1,15,moc_fild05,24,153
+moc_fild07,198,21,0	warp	mocf001	2,2,morocc,160,294
+moc_fild07,381,201,0	warp	mocf13-1	2,16,moc_fild06,28,201
+moc_fild08,16,207,0	warp	mocf15	2,4,moc_fild09,371,195
+moc_fild08,170,383,0	warp	mocf08-1	3,2,moc_fild04,175,21
+moc_fild08,204,16,0	warp	mocf16	4,2,moc_fild14,196,379
+moc_fild08,383,211,0	warp	mocf17	2,4,moc_fild13,32,171
+moc_fild09,126,20,0	warp	mocf18	4,2,moc_fild15,158,360
+moc_fild09,267,371,0	warp	mocf11-1	4,2,moc_fild05,268,21
+moc_fild09,30,162,0	warp	mocf19	2,3,moc_fild10,381,258
+moc_fild09,374,195,0	warp	mocf15-1	2,8,moc_fild08,19,207
+moc_fild09,80,369,0	warp	mocf12-1	7,2,moc_fild05,82,19
+moc_fild10,189,23,0	warp	mocf20	3,2,moc_fild11,189,360
+moc_fild10,19,207,0	warp	mocf002	2,2,morocc,299,207
+moc_fild10,208,298,0	warp	mocf14-1	10,2,moc_fild06,207,21
+moc_fild10,384,258,0	warp	mocf19-1	2,3,moc_fild09,33,162
+moc_fild11,189,363,0	warp	mocf20-1	3,2,moc_fild10,189,26
+moc_fild11,212,29,0	warp	mocf21	4,2,moc_fild17,218,366
+moc_fild11,26,161,0	warp	mocf22	2,10,moc_fild12,286,168
+moc_fild11,379,197,0	warp	mocf23	2,6,moc_fild15,41,105
+moc_fild12,118,30,0	warp	mocf24	4,2,moc_fild18,158,379
+moc_fild12,159,381,0	warp	mocf003	2,2,morocc,160,20
+moc_fild12,289,168,0	warp	mocf22-1	2,3,moc_fild11,29,161
+moc_fild13,146,368,0	warp	mocf05-1	5,2,moc_fild02,71,21
+moc_fild13,29,171,0	warp	mocf17-1	2,4,moc_fild08,380,211
+moc_fild13,298,370,0	warp	mocf03-1	4,2,moc_fild02,228,32
+moc_fild13,308,49,0	warp	mocf06-1	2,4,moc_fild03,20,37
+moc_fild14,16,278,0	warp	mocf25	2,6,moc_fild15,364,276
+moc_fild14,196,382,0	warp	mocf16-1	4,2,moc_fild08,204,19
+moc_fild15,104,16,0	warp	mocf26	9,2,moc_fild16,125,380
+moc_fild15,158,363,0	warp	mocf18-1	6,2,moc_fild09,126,23
+moc_fild15,258,253,0	script	mocf017	45,3,3,{ set @anthell,1; warp "anthell01",35,262; }
+moc_fild15,348,18,0	warp	mocf27	5,2,moc_fild16,334,379
+moc_fild15,367,276,0	warp	mocf25-1	2,4,moc_fild14,19,278
+moc_fild15,38,105,0	warp	mocf23-1	2,4,moc_fild11,376,197
+moc_fild16,125,383,0	warp	mocf26-1	5,2,moc_fild15,104,19
+moc_fild16,16,179,0	warp	mocf28	2,6,moc_fild17,366,272
+moc_fild16,334,382,0	warp	mocf27-1	4,2,moc_fild15,348,21
+moc_fild17,218,369,0	warp	mocf21-1	5,2,moc_fild11,212,32
+moc_fild17,30,300,0	warp	moc29	2,5,moc_fild18,379,305
+moc_fild17,369,272,0	warp	mocf28-1	2,3,moc_fild16,19,179
+moc_fild18,158,382,0	warp	mocf24-1	4,2,moc_fild12,118,33
+moc_fild18,382,305,0	warp	moc29-1	2,4,moc_fild17,33,300
+moc_fild19,169,107,0	warp	mocf004	1,4,morocc,27,164
+moc_fild19,71,170,0	warp	mocf018	8,2,moc_ruins,71,19
+moc_fild19,98,99,0	warp	mocf019	1,1,in_sphinx1,288,9
\ No newline at end of file
diff --git a/npc/warps/fields/mtmjolnir.txt b/npc/warps/fields/mtmjolnir.txt
index 0c7573b57..580ead478 100644
--- a/npc/warps/fields/mtmjolnir.txt
+++ b/npc/warps/fields/mtmjolnir.txt
@@ -13,49 +13,49 @@
 //============================================================
 
 //= Mt. Mjolnir ==============================================
-mjolnir_01.gat,284,18,0	warp	mjol001	4,2,gef_fild04.gat,261,359
-mjolnir_01.gat,378,256,0	warp	mjol01	2,2,mjolnir_02.gat,30,258
-mjolnir_02.gat,28,258,0	warp	mjol01-1	2,2,mjolnir_01.gat,374,256
-mjolnir_02.gat,326,289,0	warp	mjol02	1,1,mjolnir_03.gat,24,258
-mjolnir_02.gat,361,18,0	warp	mjol03	4,2,mjolnir_06.gat,366,380
-mjolnir_02.gat,79,365,0	warp	mjol013	2,1,mjo_dun01.gat,52,17
-mjolnir_03.gat,21,258,0	warp	mjol02-1	2,2,mjolnir_02.gat,323,289
-mjolnir_03.gat,212,17,0	warp	mjol04	4,2,mjolnir_07.gat,214,380
-mjolnir_03.gat,242,204,0	warp	mjol05	1,1,mjolnir_04.gat,125,208
-mjolnir_04.gat,122,208,0	warp	mjol05-1	1,1,mjolnir_03.gat,239,204
-mjolnir_04.gat,160,46,0	warp	mjol06	4,2,mjolnir_08.gat,159,370
-mjolnir_04.gat,387,174,0	warp	mjol07	2,2,mjolnir_05.gat,19,171
-mjolnir_05.gat,16,171,0	warp	mjol07-1	2,2,mjolnir_04.gat,384,174
-mjolnir_05.gat,220,382,0	warp	mjol08	4,2,mjolnir_12.gat,220,29
-mjolnir_05.gat,235,16,0	warp	mjol09	4,2,mjolnir_10.gat,235,378
-mjolnir_06.gat,18,331,0	warp	mjol002	2,4,gef_fild04.gat,359,322
-mjolnir_06.gat,265,29,0	warp	mjol003	2,2,gef_fild00.gat,267,379
-mjolnir_06.gat,366,383,0	warp	mjol03-1	4,2,mjolnir_02.gat,361,21
-mjolnir_06.gat,382,377,0	warp	mjol10	2,4,mjolnir_07.gat,19,377
-mjolnir_06.gat,383,74,0	warp	mjol11	2,4,mjolnir_07.gat,20,77
-mjolnir_07.gat,156,16,0	warp	mjol004	4,2,prt_fild00.gat,159,380
-mjolnir_07.gat,16,377,0	warp	mjol10-1	2,4,mjolnir_06.gat,379,377
-mjolnir_07.gat,17,77,0	warp	mjol11-1	2,4,mjolnir_06.gat,380,74
-mjolnir_07.gat,214,383,0	warp	mjol04-1	4,2,mjolnir_03.gat,212,20
-mjolnir_07.gat,383,233,0	warp	mjol12	2,4,mjolnir_08.gat,33,234
-mjolnir_07.gat,383,362,0	warp	mjol13	2,4,mjolnir_08.gat,32,346
-mjolnir_08.gat,159,373,0	warp	mjol06	1,1,mjolnir_04.gat,160,49
-mjolnir_08.gat,185,28,0	warp	mjol14	17,2,mjolnir_09.gat,196,364
-mjolnir_08.gat,29,346,0	warp	mjol13-1	2,4,mjolnir_07.gat,380,362
-mjolnir_08.gat,30,234,0	warp	mjol12-1	2,4,mjolnir_07.gat,380,233
-mjolnir_08.gat,369,257,0	warp	mjol15	2,4,mjolnir_10.gat,18,258
-mjolnir_09.gat,106,28,0	warp	mjol005	4,2,prt_fild05.gat,105,378
-mjolnir_09.gat,194,367,0	warp	mjol14-1	8,2,mjolnir_08.gat,185,31
-mjolnir_09.gat,30,249,0	warp	mjol006	2,4,prt_fild00.gat,380,249
-mjolnir_09.gat,300,28,0	warp	mjol007	4,2,prt_fild05.gat,292,382
-mjolnir_09.gat,373,288,0	warp	mjol011	2,2,prt_fild01.gat,23,292
-mjolnir_10.gat,15,258,0	warp	mjol15-1	2,4,mjolnir_08.gat,366,257
-mjolnir_10.gat,235,381,0	warp	mjol09-1	4,2,mjolnir_05.gat,235,19
-mjolnir_10.gat,265,13,0	warp	mjol008	3,2,prt_fild01.gat,261,370
-mjolnir_10.gat,384,220,0	warp	mjol16	2,4,mjolnir_11.gat,23,220
-mjolnir_10.gat,66,15,0	warp	mjol009	4,2,prt_fild01.gat,66,370
-mjolnir_11.gat,174,20,0	warp	mjol010	4,2,prt_fild02.gat,173,379
-mjolnir_11.gat,20,220,0	warp	mjol16-1	2,4,mjolnir_10.gat,381,220
-mjolnir_12.gat,199,378,0	warp	mjol012	2,2,aldebaran.gat,138,37
-mjolnir_12.gat,220,26,0	warp	mjol08-1	3,2,mjolnir_05.gat,220,379
-mjolnir_12.gat,44,17,0	warp	mjol17	1,1,prt_maze01.gat,17,111
+mjolnir_01,284,18,0	warp	mjol001	4,2,gef_fild04,261,359
+mjolnir_01,378,256,0	warp	mjol01	2,2,mjolnir_02,30,258
+mjolnir_02,28,258,0	warp	mjol01-1	2,2,mjolnir_01,374,256
+mjolnir_02,326,289,0	warp	mjol02	1,1,mjolnir_03,24,258
+mjolnir_02,361,18,0	warp	mjol03	4,2,mjolnir_06,366,380
+mjolnir_02,79,365,0	warp	mjol013	2,1,mjo_dun01,52,17
+mjolnir_03,21,258,0	warp	mjol02-1	2,2,mjolnir_02,323,289
+mjolnir_03,212,17,0	warp	mjol04	4,2,mjolnir_07,214,380
+mjolnir_03,242,204,0	warp	mjol05	1,1,mjolnir_04,125,208
+mjolnir_04,122,208,0	warp	mjol05-1	1,1,mjolnir_03,239,204
+mjolnir_04,160,46,0	warp	mjol06	4,2,mjolnir_08,159,370
+mjolnir_04,387,174,0	warp	mjol07	2,2,mjolnir_05,19,171
+mjolnir_05,16,171,0	warp	mjol07-1	2,2,mjolnir_04,384,174
+mjolnir_05,220,382,0	warp	mjol08	4,2,mjolnir_12,220,29
+mjolnir_05,235,16,0	warp	mjol09	4,2,mjolnir_10,235,378
+mjolnir_06,18,331,0	warp	mjol002	2,4,gef_fild04,359,322
+mjolnir_06,265,29,0	warp	mjol003	2,2,gef_fild00,267,379
+mjolnir_06,366,383,0	warp	mjol03-1	4,2,mjolnir_02,361,21
+mjolnir_06,382,377,0	warp	mjol10	2,4,mjolnir_07,19,377
+mjolnir_06,383,74,0	warp	mjol11	2,4,mjolnir_07,20,77
+mjolnir_07,156,16,0	warp	mjol004	4,2,prt_fild00,159,380
+mjolnir_07,16,377,0	warp	mjol10-1	2,4,mjolnir_06,379,377
+mjolnir_07,17,77,0	warp	mjol11-1	2,4,mjolnir_06,380,74
+mjolnir_07,214,383,0	warp	mjol04-1	4,2,mjolnir_03,212,20
+mjolnir_07,383,233,0	warp	mjol12	2,4,mjolnir_08,33,234
+mjolnir_07,383,362,0	warp	mjol13	2,4,mjolnir_08,32,346
+mjolnir_08,159,373,0	warp	mjol06	1,1,mjolnir_04,160,49
+mjolnir_08,185,28,0	warp	mjol14	17,2,mjolnir_09,196,364
+mjolnir_08,29,346,0	warp	mjol13-1	2,4,mjolnir_07,380,362
+mjolnir_08,30,234,0	warp	mjol12-1	2,4,mjolnir_07,380,233
+mjolnir_08,369,257,0	warp	mjol15	2,4,mjolnir_10,18,258
+mjolnir_09,106,28,0	warp	mjol005	4,2,prt_fild05,105,378
+mjolnir_09,194,367,0	warp	mjol14-1	8,2,mjolnir_08,185,31
+mjolnir_09,30,249,0	warp	mjol006	2,4,prt_fild00,380,249
+mjolnir_09,300,28,0	warp	mjol007	4,2,prt_fild05,292,382
+mjolnir_09,373,288,0	warp	mjol011	2,2,prt_fild01,23,292
+mjolnir_10,15,258,0	warp	mjol15-1	2,4,mjolnir_08,366,257
+mjolnir_10,235,381,0	warp	mjol09-1	4,2,mjolnir_05,235,19
+mjolnir_10,265,13,0	warp	mjol008	3,2,prt_fild01,261,370
+mjolnir_10,384,220,0	warp	mjol16	2,4,mjolnir_11,23,220
+mjolnir_10,66,15,0	warp	mjol009	4,2,prt_fild01,66,370
+mjolnir_11,174,20,0	warp	mjol010	4,2,prt_fild02,173,379
+mjolnir_11,20,220,0	warp	mjol16-1	2,4,mjolnir_10,381,220
+mjolnir_12,199,378,0	warp	mjol012	2,2,aldebaran,138,37
+mjolnir_12,220,26,0	warp	mjol08-1	3,2,mjolnir_05,220,379
+mjolnir_12,44,17,0	warp	mjol17	1,1,prt_maze01,17,111
\ No newline at end of file
diff --git a/npc/warps/fields/payon_fild.txt b/npc/warps/fields/payon_fild.txt
index ba3869fc9..cdfc31485 100644
--- a/npc/warps/fields/payon_fild.txt
+++ b/npc/warps/fields/payon_fild.txt
@@ -13,36 +13,36 @@
 //============================================================ 
 
 //= Payon Field's ============================================
-pay_fild01.gat,13,152,0	warp	payf001	2,7,moc_fild03.gat,299,170	
-pay_fild01.gat,278,14,0	warp	payf01	13,2,pay_fild02.gat,83,382	
-pay_fild01.gat,353,14,0	warp	payf02	20,3,pay_fild02.gat,160,381	
-pay_fild01.gat,379,201,0	warp	payf03	2,6,pay_fild07.gat,23,207	
-pay_fild02.gat,134,16,0	warp	payf04	5,2,pay_fild05.gat,127,375	
-pay_fild02.gat,16,175,0	warp	payf06	2,4,pay_fild11.gat,294,135	
-pay_fild02.gat,167,390,0	warp	payf02-1	20,3,pay_fild01.gat,354,18	
-pay_fild02.gat,284,108,0	warp	payf07	2,7,pay_fild03.gat,20,110	
-pay_fild02.gat,83,386,0	warp	payf01-1	13,2,pay_fild01.gat,278,18	
-pay_fild03.gat,15,110,0	warp	payf07-1	2,10,pay_fild02.gat,280,108	
-pay_fild03.gat,172,281,0	warp	payf08	5,2,pay_fild07.gat,167,20	
-pay_fild03.gat,313,16,0	warp	payf09	4,2,pay_fild06.gat,305,372	
-pay_fild03.gat,392,63,0	warp	payf005	2,7,alberta.gat,19,233	
-pay_fild04.gat,17,165,0	warp	payf002	2,8,moc_fild01.gat,376,162	
-pay_fild04.gat,194,17,0	warp	payf003	7,2,moc_fild02.gat,350,336	
-pay_fild05.gat,127,378,0	warp	payf04-1	4,2,pay_fild02.gat,134,19	
-pay_fild05.gat,271,284,0	warp	payf10	2,4,pay_fild06.gat,31,288	
-pay_fild06.gat,28,288,0	warp	payf10-1	2,2,pay_fild05.gat,268,284	
-pay_fild06.gat,305,375,0	warp	payf09-1	6,2,pay_fild03.gat,313,19	
-pay_fild07.gat,16,200,0	warp	payf03-1	3,3,pay_fild01.gat,371,205	
-pay_fild07.gat,163,17,0	warp	payf08-1	5,2,pay_fild03.gat,177,275	
-pay_fild07.gat,280,382,0	warp	payf11	4,2,pay_fild08.gat,160,19	
-pay_fild07.gat,382,290,0	warp	payf12	2,5,pay_fild10.gat,19,290
-pay_fild08.gat,160,16,0	warp	payf11-1	4,2,pay_fild07.gat,280,379
-pay_fild08.gat,17,75,0	warp	payf006	2,4,payon.gat,265,92
-pay_fild08.gat,262,91,0	warp	payf13	2,4,pay_fild09.gat,19,91
-pay_fild09.gat,112,16,0	warp	pay14	4,2,pay_fild10.gat,112,379
-pay_fild09.gat,16,91,0	warp	payf13-1	2,4,pay_fild08.gat,259,91
-pay_fild10.gat,112,382,0	warp	pay14-1	3,2,pay_fild09.gat,112,19
-pay_fild10.gat,16,290,0	warp	payf12-1	2,5,pay_fild07.gat,379,290
-pay_fild10.gat,99,13,0	warp	w1034	1,1,pay_fild10.gat,148,252
-pay_fild11.gat,297,135,0	warp	payf06-1	2,4,pay_fild02.gat,19,175
-pay_fild11.gat,38,330,0	warp	payf004	4,2,moc_fild03.gat,179,19
\ No newline at end of file
+pay_fild01,13,152,0	warp	payf001	2,7,moc_fild03,299,170	
+pay_fild01,278,14,0	warp	payf01	13,2,pay_fild02,83,382	
+pay_fild01,353,14,0	warp	payf02	20,3,pay_fild02,160,381	
+pay_fild01,379,201,0	warp	payf03	2,6,pay_fild07,23,207	
+pay_fild02,134,16,0	warp	payf04	5,2,pay_fild05,127,375	
+pay_fild02,16,175,0	warp	payf06	2,4,pay_fild11,294,135	
+pay_fild02,167,390,0	warp	payf02-1	20,3,pay_fild01,354,18	
+pay_fild02,284,108,0	warp	payf07	2,7,pay_fild03,20,110	
+pay_fild02,83,386,0	warp	payf01-1	13,2,pay_fild01,278,18	
+pay_fild03,15,110,0	warp	payf07-1	2,10,pay_fild02,280,108	
+pay_fild03,172,281,0	warp	payf08	5,2,pay_fild07,167,20	
+pay_fild03,313,16,0	warp	payf09	4,2,pay_fild06,305,372	
+pay_fild03,392,63,0	warp	payf005	2,7,alberta,19,233	
+pay_fild04,17,165,0	warp	payf002	2,8,moc_fild01,376,162	
+pay_fild04,194,17,0	warp	payf003	7,2,moc_fild02,350,336	
+pay_fild05,127,378,0	warp	payf04-1	4,2,pay_fild02,134,19	
+pay_fild05,271,284,0	warp	payf10	2,4,pay_fild06,31,288	
+pay_fild06,28,288,0	warp	payf10-1	2,2,pay_fild05,268,284	
+pay_fild06,305,375,0	warp	payf09-1	6,2,pay_fild03,313,19	
+pay_fild07,16,200,0	warp	payf03-1	3,3,pay_fild01,371,205	
+pay_fild07,163,17,0	warp	payf08-1	5,2,pay_fild03,177,275	
+pay_fild07,280,382,0	warp	payf11	4,2,pay_fild08,160,19	
+pay_fild07,382,290,0	warp	payf12	2,5,pay_fild10,19,290
+pay_fild08,160,16,0	warp	payf11-1	4,2,pay_fild07,280,379
+pay_fild08,17,75,0	warp	payf006	2,4,payon,265,92
+pay_fild08,262,91,0	warp	payf13	2,4,pay_fild09,19,91
+pay_fild09,112,16,0	warp	pay14	4,2,pay_fild10,112,379
+pay_fild09,16,91,0	warp	payf13-1	2,4,pay_fild08,259,91
+pay_fild10,112,382,0	warp	pay14-1	3,2,pay_fild09,112,19
+pay_fild10,16,290,0	warp	payf12-1	2,5,pay_fild07,379,290
+pay_fild10,99,13,0	warp	w1034	1,1,pay_fild10,148,252
+pay_fild11,297,135,0	warp	payf06-1	2,4,pay_fild02,19,175
+pay_fild11,38,330,0	warp	payf004	4,2,moc_fild03,179,19
\ No newline at end of file
diff --git a/npc/warps/fields/prontera_fild.txt b/npc/warps/fields/prontera_fild.txt
index 8baff38ff..97de8e6a2 100644
--- a/npc/warps/fields/prontera_fild.txt
+++ b/npc/warps/fields/prontera_fild.txt
@@ -13,89 +13,89 @@
 //============================================================
 
 //= Prontera Fields ==========================================
-prt_fild00.gat,159,383,0	warp	prtf007	4,2,mjolnir_07.gat,156,19
-prt_fild00.gat,165,18,0	warp	prtf01	9,3,prt_fild04.gat,158,384
-prt_fild00.gat,18,129,0	warp	prtf015	2,6,gef_fild00.gat,376,140
-prt_fild00.gat,317,18,0	warp	prtf02	8,2,prt_fild04.gat,323,384
-prt_fild00.gat,383,249,0	warp	prtf008	2,4,mjolnir_09.gat,33,248
-prt_fild01.gat,136,373,0	warp	prtf030	1,1,prt_maze01.gat,99,31
-prt_fild01.gat,199,24,0	warp	prtf001	3,2,prt_gld.gat,159,295
-prt_fild01.gat,20,292,0	warp	prtf009	2,3,mjolnir_09.gat,370,288
-prt_fild01.gat,261,373,0	warp	prtf010	6,2,mjolnir_10.gat,265,16
-prt_fild01.gat,380,243,0	warp	prtf03	2,5,prt_fild02.gat,20,242
-prt_fild01.gat,382,304,0	warp	prtf04	2,10,prt_fild02.gat,20,305
-prt_fild01.gat,382,351,0	warp	prtf05	2,8,prt_fild02.gat,20,350
-prt_fild01.gat,66,373,0	warp	prtf011	2,2,mjolnir_10.gat,66,18
-prt_fild02.gat,17,242,0	warp	prtf03-1	2,5,prt_fild01.gat,377,243
-prt_fild02.gat,17,305,0	warp	prtf04-1	2,5,prt_fild01.gat,379,302
-prt_fild02.gat,17,350,0	warp	prtf05-1	2,7,prt_fild01.gat,379,351
-prt_fild02.gat,173,382,0	warp	prtf012	4,2,mjolnir_11.gat,174,23
-prt_fild02.gat,305,17,0	warp	prtf06	10,2,prt_fild06.gat,277,315
-prt_fild02.gat,380,347,0	warp	prtf07	2,10,prt_fild03.gat,23,249
-prt_fild03.gat,16,249,0	warp	prtf07-1	2,10,prt_fild02.gat,373,353
-prt_fild03.gat,371,256,0	warp	prtf006	2,2,prt_monk.gat,25,248
-prt_fild04.gat,160,387,0	warp	prtf01-1	10,2,prt_fild00.gat,164,24
-prt_fild04.gat,17,114,0	warp	prtf016	2,10,gef_fild01.gat,375,111
-prt_fild04.gat,323,387,0	warp	prtf02-1	7,2,prt_fild00.gat,315,21
-prt_fild04.gat,378,72,0	warp	prtf08	2,6,prt_fild05.gat,17,59
-prt_fild04.gat,384,155,0	warp	prtf09	2,7,prt_fild05.gat,20,134
-prt_fild04.gat,384,334,0	warp	prtf10	2,6,prt_fild05.gat,20,333
-prt_fild05.gat,105,381,0	warp	prtf013	5,2,mjolnir_09.gat,106,34
-prt_fild05.gat,13,63,0	warp	prtf08-1	2,15,prt_fild04.gat,374,73
-prt_fild05.gat,134,14,0	warp	prtf11	14,3,prt_fild07.gat,129,374
-prt_fild05.gat,14,141,0	warp	prtf09-1	2,18,prt_fild04.gat,380,158
-prt_fild05.gat,15,333,0	warp	prtf10-1	2,8,prt_fild04.gat,380,332
-prt_fild05.gat,255,14,0	warp	prtf12	12,2,prt_fild07.gat,248,369
-prt_fild05.gat,292,385,0	warp	prtf014	4,2,mjolnir_09.gat,305,33
-prt_fild05.gat,373,205,0	warp	prtf002	3,3,prontera.gat,26,203
-prt_fild06.gat,23,193,0	warp	prtf003	2,3,prontera.gat,285,203
-prt_fild06.gat,277,320,0	warp	prtf06-1	10,2,prt_fild02.gat,305,22
-prt_fild07.gat,13,64,0	warp	prtf017	3,8,gef_fild02.gat,376,69
-prt_fild07.gat,132,381,0	warp	prtf11-1	9,3,prt_fild05.gat,142,18
-prt_fild07.gat,14,289,0	warp	prtf018	3,10,gef_fild02.gat,375,292
-prt_fild07.gat,17,145,0	warp	prtf019	3,12,gef_fild02.gat,376,156
-prt_fild07.gat,206,12,0	warp	prtf13	4,2,prt_fild09.gat,224,377
-prt_fild07.gat,248,376,0	warp	prtf12-1	8,2,prt_fild05.gat,257,18
-prt_fild07.gat,383,239,0	warp	prtf14	3,20,prt_fild08.gat,20,239
-prt_fild07.gat,385,186,0	warp	prtf15	3,20,prt_fild08.gat,20,186
-prt_fild07.gat,84,13,0	warp	prtf16	4,2,prt_fild09.gat,87,377
-prt_fild08.gat,16,187,0	warp	prtf15-1	3,17,prt_fild07.gat,380,186
-prt_fild08.gat,16,239,0	warp	prtf14-1	3,15,prt_fild07.gat,379,239
-prt_fild08.gat,170,378,0	warp	prtf004	3,2,prontera.gat,156,26
-prt_fild08.gat,233,16,0	warp	prtf023	12,1,moc_fild01.gat,238,378
-prt_fild08.gat,371,212,0	warp	prtf005	3,3,izlude.gat,35,78
-prt_fild08.gat,55,21,0	warp	prtf024	4,2,moc_fild01.gat,56,380
-prt_fild09.gat,14,124,0	warp	prtf17	2,6,prt_fild10.gat,336,126
-prt_fild09.gat,14,139,0	warp	prtf17-1	2,8,prt_fild10.gat,336,126
-prt_fild09.gat,224,380,0	warp	prtf13-1	4,2,prt_fild07.gat,206,15
-prt_fild09.gat,246,16,0	warp	prtf025	7,2,moc_fild04.gat,92,378
-prt_fild09.gat,383,223,0	warp	prtf026	2,15,moc_fild01.gat,25,242
-prt_fild09.gat,383,251,0	warp	prtf027	2,15,moc_fild01.gat,25,242
-prt_fild09.gat,87,380,0	warp	prtf16-1	5,2,prt_fild07.gat,84,16
-prt_fild09.gat,95,16,0	warp	prtf028	7,2,moc_fild05.gat,325,379
-prt_fild10.gat,20,122,0	warp	prtf19	2,4,prt_fild11.gat,359,111
-prt_fild10.gat,20,196,0	warp	prtf20	2,4,prt_fild11.gat,358,184
-prt_fild10.gat,227,299,0	warp	prtf020	5,2,gef_fild02.gat,266,21
-prt_fild10.gat,263,20,0	warp	prtf029	6,2,moc_fild05.gat,144,372
-prt_fild10.gat,339,126,0	warp	prtf17-2	2,8,prt_fild09.gat,17,133
-prt_fild11.gat,17,281,0	warp	prtf021	2,4,gef_fild11.gat,374,293
-prt_fild11.gat,302,301,0	warp	prtf022	5,2,gef_fild03.gat,312,19
-prt_fild11.gat,361,184,0	warp	prtf20-1	2,5,prt_fild10.gat,23,196
-prt_fild11.gat,362,111,0	warp	prtf19-1	2,6,prt_fild10.gat,23,122
+prt_fild00,159,383,0	warp	prtf007	4,2,mjolnir_07,156,19
+prt_fild00,165,18,0	warp	prtf01	9,3,prt_fild04,158,384
+prt_fild00,18,129,0	warp	prtf015	2,6,gef_fild00,376,140
+prt_fild00,317,18,0	warp	prtf02	8,2,prt_fild04,323,384
+prt_fild00,383,249,0	warp	prtf008	2,4,mjolnir_09,33,248
+prt_fild01,136,373,0	warp	prtf030	1,1,prt_maze01,99,31
+prt_fild01,199,24,0	warp	prtf001	3,2,prt_gld,159,295
+prt_fild01,20,292,0	warp	prtf009	2,3,mjolnir_09,370,288
+prt_fild01,261,373,0	warp	prtf010	6,2,mjolnir_10,265,16
+prt_fild01,380,243,0	warp	prtf03	2,5,prt_fild02,20,242
+prt_fild01,382,304,0	warp	prtf04	2,10,prt_fild02,20,305
+prt_fild01,382,351,0	warp	prtf05	2,8,prt_fild02,20,350
+prt_fild01,66,373,0	warp	prtf011	2,2,mjolnir_10,66,18
+prt_fild02,17,242,0	warp	prtf03-1	2,5,prt_fild01,377,243
+prt_fild02,17,305,0	warp	prtf04-1	2,5,prt_fild01,379,302
+prt_fild02,17,350,0	warp	prtf05-1	2,7,prt_fild01,379,351
+prt_fild02,173,382,0	warp	prtf012	4,2,mjolnir_11,174,23
+prt_fild02,305,17,0	warp	prtf06	10,2,prt_fild06,277,315
+prt_fild02,380,347,0	warp	prtf07	2,10,prt_fild03,23,249
+prt_fild03,16,249,0	warp	prtf07-1	2,10,prt_fild02,373,353
+prt_fild03,371,256,0	warp	prtf006	2,2,prt_monk,25,248
+prt_fild04,160,387,0	warp	prtf01-1	10,2,prt_fild00,164,24
+prt_fild04,17,114,0	warp	prtf016	2,10,gef_fild01,375,111
+prt_fild04,323,387,0	warp	prtf02-1	7,2,prt_fild00,315,21
+prt_fild04,378,72,0	warp	prtf08	2,6,prt_fild05,17,59
+prt_fild04,384,155,0	warp	prtf09	2,7,prt_fild05,20,134
+prt_fild04,384,334,0	warp	prtf10	2,6,prt_fild05,20,333
+prt_fild05,105,381,0	warp	prtf013	5,2,mjolnir_09,106,34
+prt_fild05,13,63,0	warp	prtf08-1	2,15,prt_fild04,374,73
+prt_fild05,134,14,0	warp	prtf11	14,3,prt_fild07,129,374
+prt_fild05,14,141,0	warp	prtf09-1	2,18,prt_fild04,380,158
+prt_fild05,15,333,0	warp	prtf10-1	2,8,prt_fild04,380,332
+prt_fild05,255,14,0	warp	prtf12	12,2,prt_fild07,248,369
+prt_fild05,292,385,0	warp	prtf014	4,2,mjolnir_09,305,33
+prt_fild05,373,205,0	warp	prtf002	3,3,prontera,26,203
+prt_fild06,23,193,0	warp	prtf003	2,3,prontera,285,203
+prt_fild06,277,320,0	warp	prtf06-1	10,2,prt_fild02,305,22
+prt_fild07,13,64,0	warp	prtf017	3,8,gef_fild02,376,69
+prt_fild07,132,381,0	warp	prtf11-1	9,3,prt_fild05,142,18
+prt_fild07,14,289,0	warp	prtf018	3,10,gef_fild02,375,292
+prt_fild07,17,145,0	warp	prtf019	3,12,gef_fild02,376,156
+prt_fild07,206,12,0	warp	prtf13	4,2,prt_fild09,224,377
+prt_fild07,248,376,0	warp	prtf12-1	8,2,prt_fild05,257,18
+prt_fild07,383,239,0	warp	prtf14	3,20,prt_fild08,20,239
+prt_fild07,385,186,0	warp	prtf15	3,20,prt_fild08,20,186
+prt_fild07,84,13,0	warp	prtf16	4,2,prt_fild09,87,377
+prt_fild08,16,187,0	warp	prtf15-1	3,17,prt_fild07,380,186
+prt_fild08,16,239,0	warp	prtf14-1	3,15,prt_fild07,379,239
+prt_fild08,170,378,0	warp	prtf004	3,2,prontera,156,26
+prt_fild08,233,16,0	warp	prtf023	12,1,moc_fild01,238,378
+prt_fild08,371,212,0	warp	prtf005	3,3,izlude,35,78
+prt_fild08,55,21,0	warp	prtf024	4,2,moc_fild01,56,380
+prt_fild09,14,124,0	warp	prtf17	2,6,prt_fild10,336,126
+prt_fild09,14,139,0	warp	prtf17-1	2,8,prt_fild10,336,126
+prt_fild09,224,380,0	warp	prtf13-1	4,2,prt_fild07,206,15
+prt_fild09,246,16,0	warp	prtf025	7,2,moc_fild04,92,378
+prt_fild09,383,223,0	warp	prtf026	2,15,moc_fild01,25,242
+prt_fild09,383,251,0	warp	prtf027	2,15,moc_fild01,25,242
+prt_fild09,87,380,0	warp	prtf16-1	5,2,prt_fild07,84,16
+prt_fild09,95,16,0	warp	prtf028	7,2,moc_fild05,325,379
+prt_fild10,20,122,0	warp	prtf19	2,4,prt_fild11,359,111
+prt_fild10,20,196,0	warp	prtf20	2,4,prt_fild11,358,184
+prt_fild10,227,299,0	warp	prtf020	5,2,gef_fild02,266,21
+prt_fild10,263,20,0	warp	prtf029	6,2,moc_fild05,144,372
+prt_fild10,339,126,0	warp	prtf17-2	2,8,prt_fild09,17,133
+prt_fild11,17,281,0	warp	prtf021	2,4,gef_fild11,374,293
+prt_fild11,302,301,0	warp	prtf022	5,2,gef_fild03,312,19
+prt_fild11,361,184,0	warp	prtf20-1	2,5,prt_fild10,23,196
+prt_fild11,362,111,0	warp	prtf19-1	2,6,prt_fild10,23,122
 
 //= St. Capitolina Abbey =====================================
-monk_in.gat,128,46,0	warp	monk03	1,3,monk_in.gat,161,38
-monk_in.gat,128,84,0	warp	monk04	1,3,monk_in.gat,161,90
-monk_in.gat,159,38,0	warp	monk03-1	1,3,monk_in.gat,126,46
-monk_in.gat,159,90,0	warp	monk04-1	1,3,monk_in.gat,126,84
-monk_in.gat,40,38,0	warp	monk05	1,3,monk_in.gat,71,46
-monk_in.gat,40,92,0	warp	monk06	1,3,monk_in.gat,71,84
-monk_in.gat,69,46,0	warp	monk05-1	1,3,monk_in.gat,38,38
-monk_in.gat,69,84,0	warp	monk06-1	1,3,monk_in.gat,38,92
-monk_in.gat,98,186,0	warp	monk02-1	3,2,prt_monk.gat,245,139
-monk_in.gat,98,27,0	warp	monk01-1	5,2,prt_monk.gat,245,104
-monk_in.gat,99,102,0	warp	monk07	5,1,monk_in.gat,99,143
-monk_in.gat,99,141,0	warp	monk07-1	3,1,monk_in.gat,99,100
-prt_monk.gat,22,248,0	warp	monk001	2,2,prt_fild03.gat,368,256
-prt_monk.gat,245,106,0	warp	monk01	1,1,monk_in.gat,98,30
-prt_monk.gat,245,137,0	warp	monk02	1,1,monk_in.gat,98,183
\ No newline at end of file
+monk_in,128,46,0	warp	monk03	1,3,monk_in,161,38
+monk_in,128,84,0	warp	monk04	1,3,monk_in,161,90
+monk_in,159,38,0	warp	monk03-1	1,3,monk_in,126,46
+monk_in,159,90,0	warp	monk04-1	1,3,monk_in,126,84
+monk_in,40,38,0	warp	monk05	1,3,monk_in,71,46
+monk_in,40,92,0	warp	monk06	1,3,monk_in,71,84
+monk_in,69,46,0	warp	monk05-1	1,3,monk_in,38,38
+monk_in,69,84,0	warp	monk06-1	1,3,monk_in,38,92
+monk_in,98,186,0	warp	monk02-1	3,2,prt_monk,245,139
+monk_in,98,27,0	warp	monk01-1	5,2,prt_monk,245,104
+monk_in,99,102,0	warp	monk07	5,1,monk_in,99,143
+monk_in,99,141,0	warp	monk07-1	3,1,monk_in,99,100
+prt_monk,22,248,0	warp	monk001	2,2,prt_fild03,368,256
+prt_monk,245,106,0	warp	monk01	1,1,monk_in,98,30
+prt_monk,245,137,0	warp	monk02	1,1,monk_in,98,183
\ No newline at end of file
diff --git a/npc/warps/fields/rachel_fild.txt b/npc/warps/fields/rachel_fild.txt
index 92db6f111..7fe2f08c6 100644
--- a/npc/warps/fields/rachel_fild.txt
+++ b/npc/warps/fields/rachel_fild.txt
@@ -12,34 +12,34 @@
 //= 1.0 Initial version [Playtester]
 //============================================================
 
-ra_fild01.gat,233,334,0	warp	ra000	1,1,ice_dun01.gat,157,14
-ra_fild01.gat,305,38,0	warp	ra001	1,1,ra_fild04.gat,324,375
-ra_fild04.gat,324,379,0	warp	ra002	1,1,ra_fild01.gat,305,42
-ra_fild04.gat,363,350,0	warp	ra003	1,1,ra_fild05.gat,36,358
-ra_fild05.gat,32,357,0	warp	ra004	1,1,ra_fild04.gat,359,350
-ra_fild05.gat,25,15,0	warp	ra005	1,1,ra_fild09.gat,29,339
-ra_fild09.gat,28,343,0	warp	ra006	1,1,ra_fild05.gat,29,19
-ra_fild04.gat,263,54,0	warp	ra007	1,1,ra_fild08.gat,297,367
-ra_fild08.gat,297,371,0	warp	ra008	1,1,ra_fild04.gat,263,58
-ra_fild09.gat,26,236,0	warp	ra009	1,1,ra_fild08.gat,365,234
-ra_fild08.gat,369,234,0	warp	ra010	1,1,ra_fild09.gat,30,236
-ra_fild04.gat,23,176,0	warp	ra011	1,1,ra_fild03.gat,370,172
-ra_fild03.gat,374,172,0	warp	ra012	1,1,ra_fild04.gat,27,176
-ra_fild05.gat,349,274,0	warp	ra013	1,1,ra_fild06.gat,23,280
-ra_fild06.gat,19,280,0	warp	ra014	1,1,ra_fild05.gat,345,274
-ra_fild06.gat,296,21,0	warp	ra015	1,1,lhz_fild01.gat,295,381
-lhz_fild01.gat,295,383,0	warp	ra016	1,1,ra_fild06.gat,296,23
-ra_fild12.gat,36,225,0	warp	ra017	1,1,rachel.gat,268,125
-ra_fild08.gat,168,28,0	warp	ra018	1,1,ra_fild12.gat,155,370
-ra_fild12.gat,155,375,0	warp	ra019	1,1,ra_fild08.gat,168,32
-ra_fild12.gat,279,26,0	warp	ra020	1,1,ra_fild13.gat,296,343
-ra_fild13.gat,296,347,0	warp	ra021	1,1,ra_fild12.gat,279,30
-ra_fild11.gat,361,225,0	warp	ra022	1,1,rachel.gat,30,125
-ra_fild11.gat,20,293,0	warp	ra023	1,1,ra_fild10.gat,380,297
-ra_fild10.gat,385,297,0	warp	ra024	1,1,ra_fild11.gat,25,293
-ra_fild11.gat,201,336,0	warp	ra025	1,1,ra_fild07.gat,215,30
-ra_fild07.gat,215,26,0	warp	ra025	1,1,ra_fild11.gat,201,332
-ra_fild07.gat,165,356,0	warp	ra026	1,1,ra_fild02.gat,168,40
-ra_fild02.gat,168,35,0	warp	ra027	1,1,ra_fild07.gat,165,352
-ra_fild02.gat,372,275,0	warp	ra028	1,1,ra_fild03.gat,26,297
-ra_fild03.gat,22,297,0	warp	ra029	1,1,ra_fild02.gat,368,271
\ No newline at end of file
+ra_fild01,233,334,0	warp	ra000	1,1,ice_dun01,157,14
+ra_fild01,305,38,0	warp	ra001	1,1,ra_fild04,324,375
+ra_fild04,324,379,0	warp	ra002	1,1,ra_fild01,305,42
+ra_fild04,363,350,0	warp	ra003	1,1,ra_fild05,36,358
+ra_fild05,32,357,0	warp	ra004	1,1,ra_fild04,359,350
+ra_fild05,25,15,0	warp	ra005	1,1,ra_fild09,29,339
+ra_fild09,28,343,0	warp	ra006	1,1,ra_fild05,29,19
+ra_fild04,263,54,0	warp	ra007	1,1,ra_fild08,297,367
+ra_fild08,297,371,0	warp	ra008	1,1,ra_fild04,263,58
+ra_fild09,26,236,0	warp	ra009	1,1,ra_fild08,365,234
+ra_fild08,369,234,0	warp	ra010	1,1,ra_fild09,30,236
+ra_fild04,23,176,0	warp	ra011	1,1,ra_fild03,370,172
+ra_fild03,374,172,0	warp	ra012	1,1,ra_fild04,27,176
+ra_fild05,349,274,0	warp	ra013	1,1,ra_fild06,23,280
+ra_fild06,19,280,0	warp	ra014	1,1,ra_fild05,345,274
+ra_fild06,296,21,0	warp	ra015	1,1,lhz_fild01,295,381
+lhz_fild01,295,383,0	warp	ra016	1,1,ra_fild06,296,23
+ra_fild12,36,225,0	warp	ra017	1,1,rachel,268,125
+ra_fild08,168,28,0	warp	ra018	1,1,ra_fild12,155,370
+ra_fild12,155,375,0	warp	ra019	1,1,ra_fild08,168,32
+ra_fild12,279,26,0	warp	ra020	1,1,ra_fild13,296,343
+ra_fild13,296,347,0	warp	ra021	1,1,ra_fild12,279,30
+ra_fild11,361,225,0	warp	ra022	1,1,rachel,30,125
+ra_fild11,20,293,0	warp	ra023	1,1,ra_fild10,380,297
+ra_fild10,385,297,0	warp	ra024	1,1,ra_fild11,25,293
+ra_fild11,201,336,0	warp	ra025	1,1,ra_fild07,215,30
+ra_fild07,215,26,0	warp	ra025	1,1,ra_fild11,201,332
+ra_fild07,165,356,0	warp	ra026	1,1,ra_fild02,168,40
+ra_fild02,168,35,0	warp	ra027	1,1,ra_fild07,165,352
+ra_fild02,372,275,0	warp	ra028	1,1,ra_fild03,26,297
+ra_fild03,22,297,0	warp	ra029	1,1,ra_fild02,368,271
\ No newline at end of file
diff --git a/npc/warps/fields/umbala_fild.txt b/npc/warps/fields/umbala_fild.txt
index 6b07d484d..2778c69fd 100644
--- a/npc/warps/fields/umbala_fild.txt
+++ b/npc/warps/fields/umbala_fild.txt
@@ -13,23 +13,23 @@
 //============================================================
 
 //Umbala-Umbala Fields Connection
-um_fild04.gat,215,340,0	warp	umba0055	1,1,umbala.gat,130,80
-umbala.gat,129,78,0	warp	umba0001	1,1,um_fild04.gat,215,337
+um_fild04,215,340,0	warp	umba0055	1,1,umbala,130,80
+umbala,129,78,0	warp	umba0001	1,1,um_fild04,215,337
 
 //Umbala-Comodo Connection
-beach_dun2.gat,258,244,0	warp	umba0052	1,1,um_fild01.gat,35,276
-cmd_fild01.gat,179,370,0	warp	umba0041	1,1,um_fild03.gat,239,27
-cmd_fild01.gat,78,367,0	warp	umba0043	1,1,um_fild03.gat,117,51
-um_fild01.gat,30,274,0	warp	umba0051	1,1,beach_dun2.gat,255,244
-um_fild03.gat,119,50,0	warp	umba0044	1,1,cmd_fild01.gat,78,365
-um_fild03.gat,239,25,0	warp	umba0042	1,1,cmd_fild01.gat,179,368
+beach_dun2,258,244,0	warp	umba0052	1,1,um_fild01,35,276
+cmd_fild01,179,370,0	warp	umba0041	1,1,um_fild03,239,27
+cmd_fild01,78,367,0	warp	umba0043	1,1,um_fild03,117,51
+um_fild01,30,274,0	warp	umba0051	1,1,beach_dun2,255,244
+um_fild03,119,50,0	warp	umba0044	1,1,cmd_fild01,78,365
+um_fild03,239,25,0	warp	umba0042	1,1,cmd_fild01,179,368
 
 //Umbala Fields
-um_fild01.gat,368,275,0	warp	umba0010	1,1,um_fild02.gat,24,271
-um_fild02.gat,191,374,0	warp	umba0053	1,1,um_fild04.gat,179,13
-um_fild02.gat,21,270,0	warp	umba0009	1,1,um_fild01.gat,365,275
-um_fild02.gat,374,149,0	warp	umba0008	1,1,um_fild03.gat,35,146
-um_fild02.gat,374,326,0	warp	umba0005	1,1,um_fild03.gat,21,334
-um_fild03.gat,18,334,0	warp	umba0006	1,1,um_fild02.gat,371,326
-um_fild03.gat,30,146,0	warp	umba0007	1,1,um_fild02.gat,371,149
-um_fild04.gat,179,10,0	warp	umba0054	1,1,um_fild02.gat,191,372
\ No newline at end of file
+um_fild01,368,275,0	warp	umba0010	1,1,um_fild02,24,271
+um_fild02,191,374,0	warp	umba0053	1,1,um_fild04,179,13
+um_fild02,21,270,0	warp	umba0009	1,1,um_fild01,365,275
+um_fild02,374,149,0	warp	umba0008	1,1,um_fild03,35,146
+um_fild02,374,326,0	warp	umba0005	1,1,um_fild03,21,334
+um_fild03,18,334,0	warp	umba0006	1,1,um_fild02,371,326
+um_fild03,30,146,0	warp	umba0007	1,1,um_fild02,371,149
+um_fild04,179,10,0	warp	umba0054	1,1,um_fild02,191,372
\ No newline at end of file
diff --git a/npc/warps/fields/veins_fild.txt b/npc/warps/fields/veins_fild.txt
index 84a8782df..b1d753f02 100644
--- a/npc/warps/fields/veins_fild.txt
+++ b/npc/warps/fields/veins_fild.txt
@@ -14,30 +14,30 @@
 //============================================================
 
 //= Beins Field (ve_fild) ====================================
-ve_fild02.gat,196,382,0	warp	veinswarp5001	1,1,rachel.gat,130,23
-ve_fild06.gat,154,219,0	warp	veinswarp5002	1,1,veins.gat,218,358
-ve_fild07.gat,147,372,0	warp	veinswarp5003	1,1,veins.gat,146,27
-ve_fild03.gat,168,241,0	warp	veinswarp5004	1,1,thor_v01.gat,21,226
-ve_fild01.gat,243,369,0	warp	veinswarp5005	1,1,ra_fild11.gat,232,29
-ra_fild11.gat,232,26,0	warp	veinswarp5006	1,1,ve_fild01.gat,243,366
-ve_fild01.gat,367,263,0	warp	veinswarp5007	1,1,ve_fild02.gat,33,259
-ve_fild02.gat,30,259,0	warp	veinswarp5008	1,1,ve_fild01.gat,364,263
-ve_fild01.gat,351,95,0	warp	veinswarp5009	1,1,ve_fild02.gat,76,133
-ve_fild02.gat,73,133,0	warp	veinswarp5010	1,1,ve_fild01.gat,348,95
-ve_fild01.gat,185,19,0	warp	veinswarp5011	1,1,ve_fild04.gat,174,337
-ve_fild04.gat,174,340,0	warp	veinswarp5012	1,1,ve_fild01.gat,185,22
-ve_fild02.gat,385,309,0	warp	veinswarp5013	1,1,ra_fild13.gat,31,311
-ra_fild13.gat,28,311,0	warp	veinswarp5014	1,1,ve_fild02.gat,382,309
-ve_fild03.gat,355,222,0	warp	veinswarp5015	1,1,ve_fild04.gat,46,249
-ve_fild04.gat,43,249,0	warp	veinswarp5016	1,1,ve_fild03.gat,353,221
-ve_fild03.gat,222,42,0	warp	veinswarp5017	1,1,ve_fild05.gat,204,330
-ve_fild05.gat,206,331,0	warp	veinswarp5018	1,1,ve_fild03.gat,222,45
-ve_fild04.gat,115,50,0	warp	veinswarp5019	1,1,ve_fild06.gat,78,183
-ve_fild05.gat,359,192,0	warp	veinswarp5020	1,1,ve_fild06.gat,78,183
-ve_fild06.gat,88,176,0	script	#veinswarp5021	45,1,1,{
+ve_fild02,196,382,0	warp	veinswarp5001	1,1,rachel,130,23
+ve_fild06,154,219,0	warp	veinswarp5002	1,1,veins,218,358
+ve_fild07,147,372,0	warp	veinswarp5003	1,1,veins,146,27
+ve_fild03,168,241,0	warp	veinswarp5004	1,1,thor_v01,21,226
+ve_fild01,243,369,0	warp	veinswarp5005	1,1,ra_fild11,232,29
+ra_fild11,232,26,0	warp	veinswarp5006	1,1,ve_fild01,243,366
+ve_fild01,367,263,0	warp	veinswarp5007	1,1,ve_fild02,33,259
+ve_fild02,30,259,0	warp	veinswarp5008	1,1,ve_fild01,364,263
+ve_fild01,351,95,0	warp	veinswarp5009	1,1,ve_fild02,76,133
+ve_fild02,73,133,0	warp	veinswarp5010	1,1,ve_fild01,348,95
+ve_fild01,185,19,0	warp	veinswarp5011	1,1,ve_fild04,174,337
+ve_fild04,174,340,0	warp	veinswarp5012	1,1,ve_fild01,185,22
+ve_fild02,385,309,0	warp	veinswarp5013	1,1,ra_fild13,31,311
+ra_fild13,28,311,0	warp	veinswarp5014	1,1,ve_fild02,382,309
+ve_fild03,355,222,0	warp	veinswarp5015	1,1,ve_fild04,46,249
+ve_fild04,43,249,0	warp	veinswarp5016	1,1,ve_fild03,353,221
+ve_fild03,222,42,0	warp	veinswarp5017	1,1,ve_fild05,204,330
+ve_fild05,206,331,0	warp	veinswarp5018	1,1,ve_fild03,222,45
+ve_fild04,115,50,0	warp	veinswarp5019	1,1,ve_fild06,78,183
+ve_fild05,359,192,0	warp	veinswarp5020	1,1,ve_fild06,78,183
+ve_fild06,88,176,0	script	#veinswarp5021	45,1,1,{
 	if(rand(2))
-		warp "ve_fild04.gat",115,55;
+		warp "ve_fild04",115,55;
 	else
-		warp "ve_fild05.gat",354,192;
+		warp "ve_fild05",354,192;
 	end;
-}
+}
\ No newline at end of file
diff --git a/npc/warps/fields/yuno_fild.txt b/npc/warps/fields/yuno_fild.txt
index 2cedd8902..d83681b3e 100644
--- a/npc/warps/fields/yuno_fild.txt
+++ b/npc/warps/fields/yuno_fild.txt
@@ -14,76 +14,76 @@
 //============================================================
 
 //= Yuno Field ===============================================
-//yuno_fild01.gat,286,368,0	warp	yunfild01	1,1,yuno_fild02.gat,294,26
-//yuno_fild02.gat,294,24,0	warp	yunfild01-1	1,1,yuno_fild01.gat,286,366
-//yuno_fild01.gat,70,378,0	warp	yunfild02	1,1,yuno_fild02.gat,70,25
-//yuno_fild02.gat,70,23,0	warp	yunfild02-1	1,1,yuno_fild01.gat,70,376
+//yuno_fild01,286,368,0	warp	yunfild01	1,1,yuno_fild02,294,26
+//yuno_fild02,294,24,0	warp	yunfild01-1	1,1,yuno_fild01,286,366
+//yuno_fild01,70,378,0	warp	yunfild02	1,1,yuno_fild02,70,25
+//yuno_fild02,70,23,0	warp	yunfild02-1	1,1,yuno_fild01,70,376
 
-yuno_fild02.gat,18,337,0	warp	yunfild03	1,1,yuno_fild03.gat,381,331
-yuno_fild03.gat,383,331,0	warp	yunfild03-1	1,1,yuno_fild02.gat,20,337
-yuno_fild03.gat,19,79,0	warp	yunfild04	1,1,yuno_fild04.gat,373,84
-yuno_fild04.gat,375,84,0	warp	yunfild04-1	1,1,yuno_fild03.gat,21,79
-yuno_fild03.gat,20,155,0	warp	yunfild05	1,1,yuno_fild04.gat,373,150
-yuno_fild04.gat,375,150,0	warp	yunfild05-1	1,1,yuno_fild03.gat,22,155
-yuno_fild04.gat,231,288,0	warp	yunfild-yun	1,1,yuno.gat,158,17
-yuno_fild03.gat,32,139,0	warp	yunfild-mag01	1,1,mag_dun01.gat,126,68
+yuno_fild02,18,337,0	warp	yunfild03	1,1,yuno_fild03,381,331
+yuno_fild03,383,331,0	warp	yunfild03-1	1,1,yuno_fild02,20,337
+yuno_fild03,19,79,0	warp	yunfild04	1,1,yuno_fild04,373,84
+yuno_fild04,375,84,0	warp	yunfild04-1	1,1,yuno_fild03,21,79
+yuno_fild03,20,155,0	warp	yunfild05	1,1,yuno_fild04,373,150
+yuno_fild04,375,150,0	warp	yunfild05-1	1,1,yuno_fild03,22,155
+yuno_fild04,231,288,0	warp	yunfild-yun	1,1,yuno,158,17
+yuno_fild03,32,139,0	warp	yunfild-mag01	1,1,mag_dun01,126,68
 
 //= New Yuno Fields ==========================================
-yuno_fild01.gat,26,246,0	warp	newjun01	1,1,yuno_fild12.gat,373,239
-yuno_fild12.gat,375,239,0	warp	newjun01a	1,1,yuno_fild01.gat,28,246
-yuno_fild12.gat,23,338,0	warp	newjun02	1,1,yuno_fild11.gat,366,361
-yuno_fild11.gat,368,361,0	warp	newjun02a	1,1,yuno_fild12.gat,25,338
-yuno_fild12.gat,24,225,0	warp	newjun03	1,1,yuno_fild11.gat,363,218
-yuno_fild11.gat,365,218,0	warp	newjun03a	1,1,yuno_fild12.gat,24,227
-yuno_fild07.gat,92,12,0	warp	newjun04	1,1,yuno_fild11.gat,92,369
-yuno_fild11.gat,92,371,0	warp	newjun04a	1,1,yuno_fild07.gat,92,14
-yuno_fild12.gat,193,371,0	warp	newjun05	1,1,yuno_fild08.gat,143,21
-yuno_fild08.gat,145,21,0	warp	newjun05a	1,1,yuno_fild12.gat,195,371
-yuno_fild01.gat,70,378,0	warp	newjun06	1,1,yuno_fild09.gat,70,19
-yuno_fild09.gat,70,17,0	warp	newjun06a	1,1,yuno_fild01.gat,70,376
-yuno_fild01.gat,286,368,0	warp	newjun07	1,1,yuno_fild09.gat,280,30
-yuno_fild09.gat,280,28,0	warp	newjun07a	1,1,yuno_fild01.gat,286,366
-yuno_fild09.gat,19,194,0	warp	newjun08	1,1,yuno_fild08.gat,374,193
-yuno_fild08.gat,376,193,0	warp	newjun08a	1,1,yuno_fild09.gat,21,194
-yuno_fild08.gat,20,278,0	warp	newjun09	1,1,yuno_fild07.gat,352,291
-yuno_fild07.gat,354,291,0	warp	newjun09a	1,1,yuno_fild08.gat,22,278
-yuno_fild08.gat,31,58,0	warp	newjun10	1,1,yuno_fild07.gat,358,72
-yuno_fild07.gat,360,72,0	warp	newjun10a	1,1,yuno_fild08.gat,33,58
+yuno_fild01,26,246,0	warp	newjun01	1,1,yuno_fild12,373,239
+yuno_fild12,375,239,0	warp	newjun01a	1,1,yuno_fild01,28,246
+yuno_fild12,23,338,0	warp	newjun02	1,1,yuno_fild11,366,361
+yuno_fild11,368,361,0	warp	newjun02a	1,1,yuno_fild12,25,338
+yuno_fild12,24,225,0	warp	newjun03	1,1,yuno_fild11,363,218
+yuno_fild11,365,218,0	warp	newjun03a	1,1,yuno_fild12,24,227
+yuno_fild07,92,12,0	warp	newjun04	1,1,yuno_fild11,92,369
+yuno_fild11,92,371,0	warp	newjun04a	1,1,yuno_fild07,92,14
+yuno_fild12,193,371,0	warp	newjun05	1,1,yuno_fild08,143,21
+yuno_fild08,145,21,0	warp	newjun05a	1,1,yuno_fild12,195,371
+yuno_fild01,70,378,0	warp	newjun06	1,1,yuno_fild09,70,19
+yuno_fild09,70,17,0	warp	newjun06a	1,1,yuno_fild01,70,376
+yuno_fild01,286,368,0	warp	newjun07	1,1,yuno_fild09,280,30
+yuno_fild09,280,28,0	warp	newjun07a	1,1,yuno_fild01,286,366
+yuno_fild09,19,194,0	warp	newjun08	1,1,yuno_fild08,374,193
+yuno_fild08,376,193,0	warp	newjun08a	1,1,yuno_fild09,21,194
+yuno_fild08,20,278,0	warp	newjun09	1,1,yuno_fild07,352,291
+yuno_fild07,354,291,0	warp	newjun09a	1,1,yuno_fild08,22,278
+yuno_fild08,31,58,0	warp	newjun10	1,1,yuno_fild07,358,72
+yuno_fild07,360,72,0	warp	newjun10a	1,1,yuno_fild08,33,58
 
 //= (By speculation only) ====================================
-yuno_fild07.gat,179,354,0	warp	newjun11	1,1,yuno_fild03.gat,179,17
-yuno_fild03.gat,179,15,0	warp	newjun11a	1,1,yuno_fild07.gat,179,352
-yuno_fild08.gat,74,376,0	warp	newjun12	1,1,yuno_fild02.gat,70,25
-yuno_fild02.gat,70,23,0	warp	newjun12a	1,1,yuno_fild08.gat,74,374
-yuno_fild08.gat,286,386,0	warp	newjun13	1,1,yuno_fild02.gat,294,26
-yuno_fild02.gat,294,24,0	warp	newjun13a	1,1,yuno_fild08.gat,286,384
-yuno_fild04.gat,42,369,0	warp	newjun14	1,1,yuno_fild05.gat,59,30
-yuno_fild05.gat,59,28,0	warp	newjun14a	1,1,yuno_fild04.gat,42,367
+yuno_fild07,179,354,0	warp	newjun11	1,1,yuno_fild03,179,17
+yuno_fild03,179,15,0	warp	newjun11a	1,1,yuno_fild07,179,352
+yuno_fild08,74,376,0	warp	newjun12	1,1,yuno_fild02,70,25
+yuno_fild02,70,23,0	warp	newjun12a	1,1,yuno_fild08,74,374
+yuno_fild08,286,386,0	warp	newjun13	1,1,yuno_fild02,294,26
+yuno_fild02,294,24,0	warp	newjun13a	1,1,yuno_fild08,286,384
+yuno_fild04,42,369,0	warp	newjun14	1,1,yuno_fild05,59,30
+yuno_fild05,59,28,0	warp	newjun14a	1,1,yuno_fild04,42,367
 
 
 //= Al de Baran <-> Yuno Connection ==========================
-aldebaran.gat,140,244,0	warp	alde-yunfild	1,1,yuno_fild01.gat,208,19
-yuno_fild01.gat,208,17,0	warp	yunfild-alde	1,1,aldebaran.gat,140,242
+aldebaran,140,244,0	warp	alde-yunfild	1,1,yuno_fild01,208,19
+yuno_fild01,208,17,0	warp	yunfild-alde	1,1,aldebaran,140,242
 
 //= Hugel Field
 //= Version 1
-yuno_fild05.gat,372,325,0	warp	hu001	1,1,yuno_fild06.gat,42,319
-yuno_fild06.gat,40,319,0	warp	hu001a	1,1,yuno_fild05.gat,370,325
-yuno_fild06.gat,217,27,0	warp	hu002	1,1,yuno_fild03.gat,214,381
-yuno_fild03.gat,214,383,0	warp	hu002a	1,1,yuno_fild06.gat,217,29
-yuno_fild06.gat,369,136,0	warp	hu003	1,1,hu_fild04.gat,28,126
-hu_fild04.gat,26,126,0	warp	hu003a	1,1,yuno_fild06.gat,367,136
-hu_fild04.gat,121,26,0	warp	hu004	1,1,yuno_fild02.gat,118,374
-yuno_fild02.gat,118,376,0	warp	hu004a	1,1,hu_fild04.gat,121,28
-yuno_fild06.gat,149,369,0	warp	hu005	1,1,hu_fild01.gat,139,37
-hu_fild01.gat,139,35,0	warp	hu005a	1,1,yuno_fild06.gat,151,369
-hu_fild04.gat,381,187,0	warp	hu006	1,1,hu_fild05.gat,34,202
-hu_fild05.gat,32,202,0	warp	hu006a	1,1,hu_fild04.gat,379,187
-hu_fild05.gat,91,42,0	warp	hu007	1,1,hu_fild07.gat,80,369
-hu_fild07.gat,80,371,0	warp	hu007a	1,1,hu_fild05.gat,91,44
-hu_fild07.gat,35,351,0	warp	hu008	1,1,yuno_fild02.gat,384,338
-yuno_fild02.gat,384,340,0	warp	hu008a	1,1,hu_fild07.gat,37,351
-hu_fild07.gat,56,36,0	warp	hu009	1,1,yuno_fild09.gat,47,375
-yuno_fild09.gat,47,377,0	warp	hu009a	1,1,hu_fild07.gat,56,38
-hu_fild07.gat,226,36,0	warp	hu010	1,1,yuno_fild09.gat,220,372
-yuno_fild09.gat,220,374,0	warp	hu010a	1,1,hu_fild07.gat,226,38
+yuno_fild05,372,325,0	warp	hu001	1,1,yuno_fild06,42,319
+yuno_fild06,40,319,0	warp	hu001a	1,1,yuno_fild05,370,325
+yuno_fild06,217,27,0	warp	hu002	1,1,yuno_fild03,214,381
+yuno_fild03,214,383,0	warp	hu002a	1,1,yuno_fild06,217,29
+yuno_fild06,369,136,0	warp	hu003	1,1,hu_fild04,28,126
+hu_fild04,26,126,0	warp	hu003a	1,1,yuno_fild06,367,136
+hu_fild04,121,26,0	warp	hu004	1,1,yuno_fild02,118,374
+yuno_fild02,118,376,0	warp	hu004a	1,1,hu_fild04,121,28
+yuno_fild06,149,369,0	warp	hu005	1,1,hu_fild01,139,37
+hu_fild01,139,35,0	warp	hu005a	1,1,yuno_fild06,151,369
+hu_fild04,381,187,0	warp	hu006	1,1,hu_fild05,34,202
+hu_fild05,32,202,0	warp	hu006a	1,1,hu_fild04,379,187
+hu_fild05,91,42,0	warp	hu007	1,1,hu_fild07,80,369
+hu_fild07,80,371,0	warp	hu007a	1,1,hu_fild05,91,44
+hu_fild07,35,351,0	warp	hu008	1,1,yuno_fild02,384,338
+yuno_fild02,384,340,0	warp	hu008a	1,1,hu_fild07,37,351
+hu_fild07,56,36,0	warp	hu009	1,1,yuno_fild09,47,375
+yuno_fild09,47,377,0	warp	hu009a	1,1,hu_fild07,56,38
+hu_fild07,226,36,0	warp	hu010	1,1,yuno_fild09,220,372
+yuno_fild09,220,374,0	warp	hu010a	1,1,hu_fild07,226,38
\ No newline at end of file