removed all .GAT from all the scripts and tested

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

7 files changed, 218 insertions, 219 deletions

diff --git a/npc/warps/other/airplane.txt b/npc/warps/other/airplane.txt
index e7cc8357f..5e95baea1 100644
--- a/npc/warps/other/airplane.txt
+++ b/npc/warps/other/airplane.txt
@@ -25,55 +25,55 @@
 //==========================================================================
 //Einbroch - Airport
 //==========================================================================
-einbroch.gat,92,280,0	warp	ein_ap01	1,1,airplane.gat,224,64
-einbroch.gat,64,234,0	warp	ein_ap02	1,1,airport.gat,138,51
-airport.gat,142,61,0	warp	ein_ap02a	1,1,einbroch.gat,62,246
-airport.gat,124,13,0	warp	ein_ap03	1,1,airport.gat,19,21
-airport.gat,19,18,0	warp	ein_ap03a	1,1,airport.gat,122,16
-airport.gat,161,13,0	warp	ein_ap04	1,1,airport.gat,47,21
-airport.gat,47,18,0	warp	ein_ap04a	1,1,airport.gat,163,16
-airport.gat,143,14,0	warp	ein_ap05	1,1,einbroch.gat,64,204
-einbroch.gat,64,207,0	warp	ein_ap05a	1,1,airport.gat,143,17
+einbroch,92,280,0	warp	ein_ap01	1,1,airplane,224,64
+einbroch,64,234,0	warp	ein_ap02	1,1,airport,138,51
+airport,142,61,0	warp	ein_ap02a	1,1,einbroch,62,246
+airport,124,13,0	warp	ein_ap03	1,1,airport,19,21
+airport,19,18,0	warp	ein_ap03a	1,1,airport,122,16
+airport,161,13,0	warp	ein_ap04	1,1,airport,47,21
+airport,47,18,0	warp	ein_ap04a	1,1,airport,163,16
+airport,143,14,0	warp	ein_ap05	1,1,einbroch,64,204
+einbroch,64,207,0	warp	ein_ap05a	1,1,airport,143,17
 
 
 // -Lighthalzen Airport-
-lhz_airport.gat,125,14,0	warp	lairp1	1,1,lhz_airport.gat,19,20
-lhz_airport.gat,19,18,0	warp	lairp1a	1,1,lhz_airport.gat,123,14
-lhz_airport.gat,160,14,0	warp	lairp2	1,1,lhz_airport.gat,48,20
-lhz_airport.gat,48,18,0	warp	lairp2a	1,1,lhz_airport.gat,162,14
-lighthalzen.gat,267,76,0	warp	lairp3	1,1,lhz_airport.gat,143,15
-lhz_airport.gat,143,13,0	warp	lairp3a	1,1,lighthalzen.gat,265,76
-lhz_airport.gat,143,63,0	warp	lairp4	1,1,lighthalzen.gat,296,76
-lighthalzen.gat,294,76,0	warp	lairp4a	1,1,lhz_airport.gat,143,60
-lighthalzen.gat,308,76,0	warp	lairp5	1,1,airplane.gat,224,64
+lhz_airport,125,14,0	warp	lairp1	1,1,lhz_airport,19,20
+lhz_airport,19,18,0	warp	lairp1a	1,1,lhz_airport,123,14
+lhz_airport,160,14,0	warp	lairp2	1,1,lhz_airport,48,20
+lhz_airport,48,18,0	warp	lairp2a	1,1,lhz_airport,162,14
+lighthalzen,267,76,0	warp	lairp3	1,1,lhz_airport,143,15
+lhz_airport,143,13,0	warp	lairp3a	1,1,lighthalzen,265,76
+lhz_airport,143,63,0	warp	lairp4	1,1,lighthalzen,296,76
+lighthalzen,294,76,0	warp	lairp4a	1,1,lhz_airport,143,60
+lighthalzen,308,76,0	warp	lairp5	1,1,airplane,224,64
 
 
 // -Juno Airport-
-y_airport.gat,125,14,0	warp	jairp1	1,1,y_airport.gat,19,20
-y_airport.gat,19,18,0	warp	jairp1a	1,1,y_airport.gat,123,14
-y_airport.gat,160,14,0	warp	jairp2	1,1,y_airport.gat,48,20
-y_airport.gat,48,18,0	warp	jairp2a	1,1,y_airport.gat,162,14
-yuno.gat,53,214,0	warp	jairp3	1,1,y_airport.gat,143,23
-y_airport.gat,143,16,0	warp	jairp3a	1,1,yuno.gat,52,207
-yuno.gat,52,238,0	warp	jairp4a	1,1,y_airport.gat,143,60
-yuno.gat,55,238,0	warp	jairp5a	1,1,y_airport.gat,143,60
-yuno.gat,8,261,0	warp	jairp6	1,1,airplane_01.gat,224,64
-yuno.gat,97,260,0	warp	jairp7	1,1,airplane.gat,224,64
+y_airport,125,14,0	warp	jairp1	1,1,y_airport,19,20
+y_airport,19,18,0	warp	jairp1a	1,1,y_airport,123,14
+y_airport,160,14,0	warp	jairp2	1,1,y_airport,48,20
+y_airport,48,18,0	warp	jairp2a	1,1,y_airport,162,14
+yuno,53,214,0	warp	jairp3	1,1,y_airport,143,23
+y_airport,143,16,0	warp	jairp3a	1,1,yuno,52,207
+yuno,52,238,0	warp	jairp4a	1,1,y_airport,143,60
+yuno,55,238,0	warp	jairp5a	1,1,y_airport,143,60
+yuno,8,261,0	warp	jairp6	1,1,airplane_01,224,64
+yuno,97,260,0	warp	jairp7	1,1,airplane,224,64
 
 
 //=========================================================================
 //Airplane
 //=========================================================================
-airplane.gat,254,54,0	warp	air_1wp01	1,1,airplane.gat,91,67
-airplane.gat,87,67,0	warp	air_1wp01a	1,1,airplane.gat,250,54
-airplane.gat,208,53,0	warp	air_1wp02	1,1,airplane.gat,239,160
-airplane.gat,245,160,0	warp	air_1wp02a	1,1,airplane.gat,214,54
+airplane,254,54,0	warp	air_1wp01	1,1,airplane,91,67
+airplane,87,67,0	warp	air_1wp01a	1,1,airplane,250,54
+airplane,208,53,0	warp	air_1wp02	1,1,airplane,239,160
+airplane,245,160,0	warp	air_1wp02a	1,1,airplane,214,54
 
-airplane_01.gat,254,54,0	warp	air_2wp01	1,1,airplane_01.gat,91,67
-airplane_01.gat,87,67,0	warp	air_2wp01a	1,1,airplane_01.gat,250,54
-airplane_01.gat,208,53,0	warp	air_2wp02	1,1,airplane_01.gat,239,160
-airplane_01.gat,245,160,0	warp	air_2wp02a	1,1,airplane_01.gat,214,54
-airplane_01.gat,104,199,0	warp	air_2wp03	1,1,airplane_01.gat,105,72
-airplane_01.gat,103,72,0	warp	air_2wp03a	1,1,airplane_01.gat,102,199
-airplane_01.gat,104,176,0	warp	air_2wp04	1,1,airplane_01.gat,105,52
-airplane_01.gat,103,52,0	warp	air_2wp04a	1,1,airplane_01.gat,102,176
+airplane_01,254,54,0	warp	air_2wp01	1,1,airplane_01,91,67
+airplane_01,87,67,0	warp	air_2wp01a	1,1,airplane_01,250,54
+airplane_01,208,53,0	warp	air_2wp02	1,1,airplane_01,239,160
+airplane_01,245,160,0	warp	air_2wp02a	1,1,airplane_01,214,54
+airplane_01,104,199,0	warp	air_2wp03	1,1,airplane_01,105,72
+airplane_01,103,72,0	warp	air_2wp03a	1,1,airplane_01,102,199
+airplane_01,104,176,0	warp	air_2wp04	1,1,airplane_01,105,52
+airplane_01,103,52,0	warp	air_2wp04a	1,1,airplane_01,102,176
\ No newline at end of file
diff --git a/npc/warps/other/arena.txt b/npc/warps/other/arena.txt
index ac7bf7d8f..b9acb4e56 100644
--- a/npc/warps/other/arena.txt
+++ b/npc/warps/other/arena.txt
@@ -13,16 +13,16 @@
 //= 1.0 First version, done by SinSloth. [MasterOfMuppets]
 //============================================================
 
-izlude.gat,128,126,0	warp	welcome_arena	1,1,arena_room.gat,100,30
-arena_room.gat,99,24,0	warp	bye_arena	2,2,izlude.gat,128,220
-arena_room.gat,84,103,0	warp	arn_room_11_1	1,1,arena_room.gat,63,130
-arena_room.gat,63,126,0	warp	arn_room_11_2	1,1,arena_room.gat,87,100
-arena_room.gat,76,87,0	warp	arn_room_9_1	1,1,arena_room.gat,46,87
-arena_room.gat,49,87,0	warp	arn_room_9_2	1,1,arena_room.gat,78,87
-arena_room.gat,84,71,0	warp	arn_room_7_1	1,1,arena_room.gat,60,50
-arena_room.gat,63,53,0	warp	arn_room_7_2	1,1,arena_room.gat,86,74
-arena_room.gat,115,71,0	warp	arn_room_5_1	1,1,arena_room.gat,139,50
-arena_room.gat,136,53,0	warp	arn_room_5_2	1,1,arena_room.gat,113,74
-arena_room.gat,123,88,0	warp	arn_room_3_1	1,1,arena_room.gat,153,87
-arena_room.gat,150,87,0	warp	arn_room_3_2	1,1,arena_room.gat,120,87
-prt_are_in.gat,54,13,0	warp	toarn_room	1,1,arena_room.gat,100,77
+izlude,128,126,0	warp	welcome_arena	1,1,arena_room,100,30
+arena_room,99,24,0	warp	bye_arena	2,2,izlude,128,220
+arena_room,84,103,0	warp	arn_room_11_1	1,1,arena_room,63,130
+arena_room,63,126,0	warp	arn_room_11_2	1,1,arena_room,87,100
+arena_room,76,87,0	warp	arn_room_9_1	1,1,arena_room,46,87
+arena_room,49,87,0	warp	arn_room_9_2	1,1,arena_room,78,87
+arena_room,84,71,0	warp	arn_room_7_1	1,1,arena_room,60,50
+arena_room,63,53,0	warp	arn_room_7_2	1,1,arena_room,86,74
+arena_room,115,71,0	warp	arn_room_5_1	1,1,arena_room,139,50
+arena_room,136,53,0	warp	arn_room_5_2	1,1,arena_room,113,74
+arena_room,123,88,0	warp	arn_room_3_1	1,1,arena_room,153,87
+arena_room,150,87,0	warp	arn_room_3_2	1,1,arena_room,120,87
+prt_are_in,54,13,0	warp	toarn_room	1,1,arena_room,100,77
\ No newline at end of file
diff --git a/npc/warps/other/god.txt b/npc/warps/other/god.txt
index 447b42213..d09be4de5 100644
--- a/npc/warps/other/god.txt
+++ b/npc/warps/other/god.txt
@@ -12,11 +12,10 @@
 //= 1.0 Added some warps of the Sleipnir part [SinSloth]
 //============================================================
 
-yuno.gat,218,180,0	warp	yuno_god01	1,1,que_god01.gat,99,84				
-que_god01.gat,99,81,0	warp	god01_yuno	1,1,yuno.gat,218,177
-que_god01.gat,63,88,0	warp	god_sl_w0-1	1,1,que_god01.gat,87,92	
-que_god01.gat,62,116,0	warp	god_sl_w1-1	1,1,que_god01.gat,46,94	
-que_god01.gat,12,116,0	warp	god_sl_w2-1	1,1,que_god01.gat,16,94	
-que_god01.gat,12,55,0	warp	god_sl_w3-1	1,1,que_god01.gat,17,83	
-que_god01.gat,50,55,0	warp	god_sl_w4-1	1,1,que_god01.gat,47,83	
-
+yuno,218,180,0	warp	yuno_god01	1,1,que_god01,99,84				
+que_god01,99,81,0	warp	god01_yuno	1,1,yuno,218,177
+que_god01,63,88,0	warp	god_sl_w0-1	1,1,que_god01,87,92	
+que_god01,62,116,0	warp	god_sl_w1-1	1,1,que_god01,46,94	
+que_god01,12,116,0	warp	god_sl_w2-1	1,1,que_god01,16,94	
+que_god01,12,55,0	warp	god_sl_w3-1	1,1,que_god01,17,83	
+que_god01,50,55,0	warp	god_sl_w4-1	1,1,que_god01,47,83	
diff --git a/npc/warps/other/jobquests.txt b/npc/warps/other/jobquests.txt
index 6380f805f..d20016710 100644
--- a/npc/warps/other/jobquests.txt
+++ b/npc/warps/other/jobquests.txt
@@ -24,99 +24,99 @@
 //==============================================================================
 //Novice
 //==============================================================================
-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
+new_zone01,148,112,0	warp	newwarp6001	2,2,new_zone02,100,9
+new_zone02,100,6,0	warp	newwarp6002	2,2,new_zone01,144,112
+new_zone02,126,106,0	warp	newwarp6003	2,2,new_zone02,160,171
+new_zone02,156,171,0	warp	newwarp6004	2,2,new_zone02,123,106
+new_zone02,73,106,0	warp	newwarp6005	2,2,new_zone02,41,172
+new_zone02,46,172,0	warp	newwarp6006	2,2,new_zone02,78,106
 
 //==============================================================================
 //Swordman
 //==============================================================================
-job_sword1.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
+job_sword1,192,244,0	warp	SwordWarp0	2,2,job_sword1,215,244
+job_sword1,223,243,0	warp	SwordWarp1	2,2,job_sword1,12,206
+job_sword1,192,206,0	warp	SwordWarp2	2,2,job_sword1,215,205
+job_sword1,223,205,0	warp	SwordWarp3	2,2,job_sword1,12,168
+job_sword1,192,168,0	warp	SwordWarp4	2,2,job_sword1,215,167
 // Underground cave
-job_sword1.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
+job_sword1,65,117,0	warp	swd101	1,1,job_sword1,10,245
+job_sword1,98,27,0	warp	swd102	1,1,job_sword1,11,207
+job_sword1,161,27,0	warp	swd103	1,1,job_sword1,11,207
+job_sword1,239,117,0	warp	swd106	1,1,job_sword1,11,169
 
 //==============================================================================
 //Thief
 //==============================================================================
-job_thief1.gat,180,15,0	warp	jthf	7,1,moc_ruins.gat,145,117
+job_thief1,180,15,0	warp	jthf	7,1,moc_ruins,145,117
 
 
 //==============================================================================
 // Assassin
 //==============================================================================
-in_moc_16.gat,18,8,0	warp	guild_to_16	2,2,moc_fild16.gat,205,291
-moc_fild16.gat,205,296,0	warp	16_to_guild	2,2,in_moc_16.gat,18,11
+in_moc_16,18,8,0	warp	guild_to_16	2,2,moc_fild16,205,291
+moc_fild16,205,296,0	warp	16_to_guild	2,2,in_moc_16,18,11
 
 //==============================================================================
 // Hunter
 //==============================================================================
-in_hunter.gat,100,15,0	warp	jhun01	0,0,pay_fild10.gat,143,250
+in_hunter,100,15,0	warp	jhun01	0,0,pay_fild10,143,250
 
 
 
 //==============================================================================
 // Monk (St. Capitolina Abbey)
 //==============================================================================
-prt_monk.gat,192,172,0	warp	monk15	1,1,monk_test.gat,329,50
-monk_test.gat,329,47,0	warp	monk16	1,1,prt_monk.gat,193,166
-monk_test.gat,329,76,0	warp	monk17	1,1,monk_test.gat,259,118
-monk_test.gat,259,115,0	warp	monk18	1,1,monk_test.gat,329,71
-monk_test.gat,272,125,0	warp	monk19	1,1,monk_test.gat,301,127
-monk_test.gat,298,127,0	warp	monk20	1,1,monk_test.gat,268,125
+prt_monk,192,172,0	warp	monk15	1,1,monk_test,329,50
+monk_test,329,47,0	warp	monk16	1,1,prt_monk,193,166
+monk_test,329,76,0	warp	monk17	1,1,monk_test,259,118
+monk_test,259,115,0	warp	monk18	1,1,monk_test,329,71
+monk_test,272,125,0	warp	monk19	1,1,monk_test,301,127
+monk_test,298,127,0	warp	monk20	1,1,monk_test,268,125
 
 //==============================================================================
 //Alchemist
 //==============================================================================
 //Town - Alchemist , Alchemist - Town
-aldebaran.gat,54,66,0	warp	alche01	1,1,alde_alche.gat,41,174
-alde_alche.gat,41,171,0	warp	alche02	1,1,aldebaran.gat,56,68
+aldebaran,54,66,0	warp	alche01	1,1,alde_alche,41,174
+alde_alche,41,171,0	warp	alche02	1,1,aldebaran,56,68
 //Alchemist Hall 1st Floor Top Rooms
-alde_alche.gat,129,104,0	warp	alche03	1,1,alde_alche.gat,163,163
-alde_alche.gat,159,163,0	warp	alche04	1,1,alde_alche.gat,126,104
-alde_alche.gat,131,77,0	warp	alche05	1,1,alde_alche.gat,162,107
-alde_alche.gat,159,107,0	warp	alche06	1,1,alde_alche.gat,128,77
+alde_alche,129,104,0	warp	alche03	1,1,alde_alche,163,163
+alde_alche,159,163,0	warp	alche04	1,1,alde_alche,126,104
+alde_alche,131,77,0	warp	alche05	1,1,alde_alche,162,107
+alde_alche,159,107,0	warp	alche06	1,1,alde_alche,128,77
 //Alchemist Hall 1st Floor Bottom Rooms
-alde_alche.gat,47,103,0	warp	alche07	1,1,alde_alche.gat,88,18
-alde_alche.gat,92,18,0	warp	alche08	1,1,alde_alche.gat,50,103
-alde_alche.gat,47,77,0	warp	alche09	1,1,alde_alche.gat,155,18
-alde_alche.gat,159,18,0	warp	alche10	1,1,alde_alche.gat,50,77
+alde_alche,47,103,0	warp	alche07	1,1,alde_alche,88,18
+alde_alche,92,18,0	warp	alche08	1,1,alde_alche,50,103
+alde_alche,47,77,0	warp	alche09	1,1,alde_alche,155,18
+alde_alche,159,18,0	warp	alche10	1,1,alde_alche,50,77
 //Alchemist Hall 2nd Floor - 1st Floor Link
-alde_alche.gat,14,184,0	warp	alche11	1,1,alde_alche.gat,88,113
-alde_alche.gat,88,117,0	warp	alche12	1,1,alde_alche.gat,14,180
+alde_alche,14,184,0	warp	alche11	1,1,alde_alche,88,113
+alde_alche,88,117,0	warp	alche12	1,1,alde_alche,14,180
 //Alchemist Hall 2nd Floor Rooms
-alde_alche.gat,19,171,0	warp	alche13	1,1,aldebaran.gat,68,56
-aldebaran.gat,66,54,0	warp	alche14	1,1,alde_alche.gat,19,175
-alde_alche.gat,18,28,0	warp	alche15	1,1,alde_alche.gat,89,66
-alde_alche.gat,89,63,0	warp	alche16	1,1,alde_alche.gat,18,24
+alde_alche,19,171,0	warp	alche13	1,1,aldebaran,68,56
+aldebaran,66,54,0	warp	alche14	1,1,alde_alche,19,175
+alde_alche,18,28,0	warp	alche15	1,1,alde_alche,89,66
+alde_alche,89,63,0	warp	alche16	1,1,alde_alche,18,24
 //Alchemist Hall 3rd Floor
-alde_alche.gat,41,187,0	warp	alche17	1,1,alde_alche.gat,114,178
-alde_alche.gat,114,182,0	warp	alche18	1,1,alde_alche.gat,41,183
+alde_alche,41,187,0	warp	alche17	1,1,alde_alche,114,178
+alde_alche,114,182,0	warp	alche18	1,1,alde_alche,41,183
 
 //==============================================================================
 //Rogue
 //==============================================================================
-cmd_fild07.gat,193,117,0	warp	fild07-rogue00	1,1,in_rogue.gat,378,46
-in_rogue.gat,375,46,0	warp	rogue00-fild07	1,1,cmd_fild07.gat,195,116
-in_rogue.gat,376,34,0	warp	rogue01-02	1,1,in_rogue.gat,378,125
-in_rogue.gat,375,125,0	warp	rogue02-01	1,1,in_rogue.gat,379,34
-cmd_fild07.gat,352,275,0	warp	fild07-rogue03	1,1,in_rogue.gat,265,122
-in_rogue.gat,265,118,0	warp	rogue03-fild07	1,1,cmd_fild07.gat,349,275
-in_rogue.gat,244,20,0	warp	rogue04-fild09	1,1,cmd_fild09.gat,106,192
-in_rogue.gat,172,34,0	warp	rogue05-fild09	1,1,cmd_fild09.gat,339,143
-in_rogue.gat,160,103,0	warp	rogue06-fild04	1,1,cmd_fild04.gat,301,177
+cmd_fild07,193,117,0	warp	fild07-rogue00	1,1,in_rogue,378,46
+in_rogue,375,46,0	warp	rogue00-fild07	1,1,cmd_fild07,195,116
+in_rogue,376,34,0	warp	rogue01-02	1,1,in_rogue,378,125
+in_rogue,375,125,0	warp	rogue02-01	1,1,in_rogue,379,34
+cmd_fild07,352,275,0	warp	fild07-rogue03	1,1,in_rogue,265,122
+in_rogue,265,118,0	warp	rogue03-fild07	1,1,cmd_fild07,349,275
+in_rogue,244,20,0	warp	rogue04-fild09	1,1,cmd_fild09,106,192
+in_rogue,172,34,0	warp	rogue05-fild09	1,1,cmd_fild09,339,143
+in_rogue,160,103,0	warp	rogue06-fild04	1,1,cmd_fild04,301,177
 
 //==============================================================================
 //Dancer
 //==============================================================================
-//job_duncer.gat,69,43,0	warp 	duncer1	1,1,comodo.gat,185,156
-job_duncer.gat,70,45,0	warp	duncer1	2,2,comodo.gat,193,149
+//job_duncer,69,43,0	warp 	duncer1	1,1,comodo,185,156
+job_duncer,70,45,0	warp	duncer1	2,2,comodo,193,149
\ No newline at end of file
diff --git a/npc/warps/other/kiel.txt b/npc/warps/other/kiel.txt
index 0cdfe6c61..381d2f5cf 100644
--- a/npc/warps/other/kiel.txt
+++ b/npc/warps/other/kiel.txt
@@ -18,96 +18,96 @@
 // kh_school
 //============================================================
 //Entrance Level
-kh_school.gat,77,155,0	warp	school01	1,1,yuno_fild08.gat,154,189
-kh_school.gat,30,184,0	warp	school02	1,1,kh_school.gat,63,75
-kh_school.gat,30,125,0	warp	school03	1,1,kh_school.gat,63,14
-kh_school.gat,34,177,0	warp	school04	1,1,kh_school.gat,147,57
-kh_school.gat,34,133,0	warp	school05	1,1,kh_school.gat,147,17
+kh_school,77,155,0	warp	school01	1,1,yuno_fild08,154,189
+kh_school,30,184,0	warp	school02	1,1,kh_school,63,75
+kh_school,30,125,0	warp	school03	1,1,kh_school,63,14
+kh_school,34,177,0	warp	school04	1,1,kh_school,147,57
+kh_school,34,133,0	warp	school05	1,1,kh_school,147,17
 //Basement Level
-kh_school.gat,153,57,0	warp	school06	1,1,kh_school.gat,39,177
-kh_school.gat,153,17,0	warp	school07	1,1,kh_school.gat,39,133
+kh_school,153,57,0	warp	school06	1,1,kh_school,39,177
+kh_school,153,17,0	warp	school07	1,1,kh_school,39,133
 //Upper Level
-kh_school.gat,71,75,0	warp	school08	1,1,kh_school.gat,39,184
-kh_school.gat,71,14,0	warp	school09	1,1,kh_school.gat,39,125
-kh_school.gat,12,48,0	warp	school10	1,1,kh_school.gat,182,117
-kh_school.gat,187,117,0	warp	school11	1,1,kh_school.gat,17,48
+kh_school,71,75,0	warp	school08	1,1,kh_school,39,184
+kh_school,71,14,0	warp	school09	1,1,kh_school,39,125
+kh_school,12,48,0	warp	school10	1,1,kh_school,182,117
+kh_school,187,117,0	warp	school11	1,1,kh_school,17,48
 //Detention Room
-kh_school.gat,63,80,0	warp	school12	1,1,kh_school.gat,118,144
-kh_school.gat,118,139,0	warp	school13	1,1,kh_school.gat,63,75
+kh_school,63,80,0	warp	school12	1,1,kh_school,118,144
+kh_school,118,139,0	warp	school13	1,1,kh_school,63,75
 //Yuno Field
-yuno_fild08.gat,148,189,0	warp	school14	1,1,kh_school.gat,71,158
+yuno_fild08,148,189,0	warp	school14	1,1,kh_school,71,158
 
 //============================================================
 // kh_vila
 //============================================================
 //Entrance
-yuno_fild02.gat,92,213,0	warp	vila18	1,1,kh_vila.gat,79,14
+yuno_fild02,92,213,0	warp	vila18	1,1,kh_vila,79,14
 //Entrance Hall
-kh_vila.gat,79,10,0	warp	vila01	1,1,yuno_fild02.gat,92,208
-kh_vila.gat,70,38,0	warp	vila02	1,1,kh_vila.gat,43,38
-kh_vila.gat,70,54,0	warp	vila03	1,1,kh_vila.gat,43,55
-kh_vila.gat,91,49,0	warp	vila04	1,1,kh_vila.gat,118,47
-kh_vila.gat,84,67,0	warp	vila05	1,1,kh_vila.gat,45,106
+kh_vila,79,10,0	warp	vila01	1,1,yuno_fild02,92,208
+kh_vila,70,38,0	warp	vila02	1,1,kh_vila,43,38
+kh_vila,70,54,0	warp	vila03	1,1,kh_vila,43,55
+kh_vila,91,49,0	warp	vila04	1,1,kh_vila,118,47
+kh_vila,84,67,0	warp	vila05	1,1,kh_vila,45,106
 //Lounge and Atrium
-kh_vila.gat,47,39,0	warp	vila06	1,1,kh_vila.gat,74,38
-kh_vila.gat,47,55,0	warp	vila07	1,1,kh_vila.gat,74,54
-kh_vila.gat,34,67,0	warp	vila08	1,1,kh_vila.gat,20,106
+kh_vila,47,39,0	warp	vila06	1,1,kh_vila,74,38
+kh_vila,47,55,0	warp	vila07	1,1,kh_vila,74,54
+kh_vila,34,67,0	warp	vila08	1,1,kh_vila,20,106
 //Dining Room, Kitchen, Store Room
-kh_vila.gat,20,102,0	warp	vila09	1,1,kh_vila.gat,34,63
-kh_vila.gat,45,102,0	warp	vila10	1,1,kh_vila.gat,84,63
-kh_vila.gat,32,129,0	warp	vila11	1,1,kh_vila.gat,22,170
-kh_vila.gat,22,166,0	warp	vila12	1,1,kh_vila.gat,32,125
-kh_vila.gat,27,189,0	warp	vila13	1,1,kh_vila.gat,185,18
-kh_vila.gat,191,18,0	warp	vila14	1,1,kh_vila.gat,27,185
+kh_vila,20,102,0	warp	vila09	1,1,kh_vila,34,63
+kh_vila,45,102,0	warp	vila10	1,1,kh_vila,84,63
+kh_vila,32,129,0	warp	vila11	1,1,kh_vila,22,170
+kh_vila,22,166,0	warp	vila12	1,1,kh_vila,32,125
+kh_vila,27,189,0	warp	vila13	1,1,kh_vila,185,18
+kh_vila,191,18,0	warp	vila14	1,1,kh_vila,27,185
 //Stairwell and Upstairs
-kh_vila.gat,114,47,0	warp	vila15	1,1,kh_vila.gat,86,49
-kh_vila.gat,126,76,0	warp	vila16	1,1,kh_vila.gat,180,175
-kh_vila.gat,180,170,0	warp	vila17	1,1,kh_vila.gat,127,71
+kh_vila,114,47,0	warp	vila15	1,1,kh_vila,86,49
+kh_vila,126,76,0	warp	vila16	1,1,kh_vila,180,175
+kh_vila,180,170,0	warp	vila17	1,1,kh_vila,127,71
 
-kh_vila.gat,174,72,0	warp	vila19	1,1,kh_vila.gat,181,125
+kh_vila,174,72,0	warp	vila19	1,1,kh_vila,181,125
 
 
 //============================================================
 // kh_rossi - House of the Losimier family
 //============================================================
 //Entrance Level
-//???.gat,???,???,0	warp	rossi01	1,1,kh_rossi.gat,17,93
-//kh_rossi.gat,12,93,0	warp	rossi02	1,1,???.gat,???,???
-kh_rossi.gat,35,99,0	warp	rossi03	1,1,kh_rossi.gat,27,146
-kh_rossi.gat,27,142,0	warp	rossi04	1,1,kh_rossi.gat,35,95
-kh_rossi.gat,35,86,0	warp	rossi05	1,1,kh_rossi.gat,27,39
-kh_rossi.gat,27,43,0	warp	rossi06	1,1,kh_rossi.gat,35,90
-kh_rossi.gat,63,86,0	warp	rossi07	1,1,kh_rossi.gat,99,39
-kh_rossi.gat,99,43,0	warp	rossi08	1,1,kh_rossi.gat,63,90
-kh_rossi.gat,90,86,0	warp	rossi09	1,1,kh_rossi.gat,168,31
-kh_rossi.gat,168,35,0	warp	rossi10	1,1,kh_rossi.gat,90,90
-kh_rossi.gat,43,26,0	warp	rossi11	1,1,kh_rossi.gat,90,25
-kh_rossi.gat,86,25,0	warp	rossi12	1,1,kh_rossi.gat,37,26
-kh_rossi.gat,91,101,0	warp	rossi13	1,1,kh_rossi.gat,282,65
+//???,???,???,0	warp	rossi01	1,1,kh_rossi,17,93
+//kh_rossi,12,93,0	warp	rossi02	1,1,???,???,???
+kh_rossi,35,99,0	warp	rossi03	1,1,kh_rossi,27,146
+kh_rossi,27,142,0	warp	rossi04	1,1,kh_rossi,35,95
+kh_rossi,35,86,0	warp	rossi05	1,1,kh_rossi,27,39
+kh_rossi,27,43,0	warp	rossi06	1,1,kh_rossi,35,90
+kh_rossi,63,86,0	warp	rossi07	1,1,kh_rossi,99,39
+kh_rossi,99,43,0	warp	rossi08	1,1,kh_rossi,63,90
+kh_rossi,90,86,0	warp	rossi09	1,1,kh_rossi,168,31
+kh_rossi,168,35,0	warp	rossi10	1,1,kh_rossi,90,90
+kh_rossi,43,26,0	warp	rossi11	1,1,kh_rossi,90,25
+kh_rossi,86,25,0	warp	rossi12	1,1,kh_rossi,37,26
+kh_rossi,91,101,0	warp	rossi13	1,1,kh_rossi,282,65
 
 //Upper Level
-kh_rossi.gat,282,60,0	warp	rossi14	1,1,kh_rossi.gat,91,95
-kh_rossi.gat,222,24,0	warp	rossi15	1,1,kh_rossi.gat,22,219
-kh_rossi.gat,22,223,0	warp	rossi16	1,1,kh_rossi.gat,222,28
-kh_rossi.gat,248,24,0	warp	rossi17	1,1,kh_rossi.gat,88,219
-kh_rossi.gat,88,223,0	warp	rossi18	1,1,kh_rossi.gat,248,28
-kh_rossi.gat,258,46,0	warp	rossi19	1,1,kh_rossi.gat,225,235
-kh_rossi.gat,222,69,0	warp	rossi20	1,1,kh_rossi.gat,22,276
-kh_rossi.gat,22,272,0	warp	rossi21	1,1,kh_rossi.gat,222,65
-kh_rossi.gat,248,69,0	warp	rossi21	1,1,kh_rossi.gat,88,276
-kh_rossi.gat,88,272,0	warp	rossi23	1,1,kh_rossi.gat,248,65
+kh_rossi,282,60,0	warp	rossi14	1,1,kh_rossi,91,95
+kh_rossi,222,24,0	warp	rossi15	1,1,kh_rossi,22,219
+kh_rossi,22,223,0	warp	rossi16	1,1,kh_rossi,222,28
+kh_rossi,248,24,0	warp	rossi17	1,1,kh_rossi,88,219
+kh_rossi,88,223,0	warp	rossi18	1,1,kh_rossi,248,28
+kh_rossi,258,46,0	warp	rossi19	1,1,kh_rossi,225,235
+kh_rossi,222,69,0	warp	rossi20	1,1,kh_rossi,22,276
+kh_rossi,22,272,0	warp	rossi21	1,1,kh_rossi,222,65
+kh_rossi,248,69,0	warp	rossi21	1,1,kh_rossi,88,276
+kh_rossi,88,272,0	warp	rossi23	1,1,kh_rossi,248,65
 
 //Hallway
-kh_rossi.gat,229,235,0	warp	rossi24	1,1,kh_rossi.gat,263,46
-kh_rossi.gat,188,239,0	warp	rossi25	1,1,kh_rossi.gat,148,281
-kh_rossi.gat,148,278,0	warp	rossi26	1,1,kh_rossi.gat,188,235
-kh_rossi.gat,204,239,0	warp	rossi27	1,1,kh_rossi.gat,204,281
-kh_rossi.gat,204,278,0	warp	rossi28	1,1,kh_rossi.gat,204,235
-kh_rossi.gat,220,239,0	warp	rossi29	1,1,kh_rossi.gat,260,281
-kh_rossi.gat,260,278,0	warp	rossi30	1,1,kh_rossi.gat,220,235
-kh_rossi.gat,188,230,0	warp	rossi31	1,1,kh_rossi.gat,148,187
-kh_rossi.gat,148,191,0	warp	rossi32	1,1,kh_rossi.gat,188,234
-kh_rossi.gat,204,230,0	warp	rossi33	1,1,kh_rossi.gat,204,187
-kh_rossi.gat,204,191,0	warp	rossi34	1,1,kh_rossi.gat,204,234
-kh_rossi.gat,220,230,0	warp	rossi35	1,1,kh_rossi.gat,260,187
-kh_rossi.gat,260,191,0	warp	rossi36	1,1,kh_rossi.gat,220,234
\ No newline at end of file
+kh_rossi,229,235,0	warp	rossi24	1,1,kh_rossi,263,46
+kh_rossi,188,239,0	warp	rossi25	1,1,kh_rossi,148,281
+kh_rossi,148,278,0	warp	rossi26	1,1,kh_rossi,188,235
+kh_rossi,204,239,0	warp	rossi27	1,1,kh_rossi,204,281
+kh_rossi,204,278,0	warp	rossi28	1,1,kh_rossi,204,235
+kh_rossi,220,239,0	warp	rossi29	1,1,kh_rossi,260,281
+kh_rossi,260,278,0	warp	rossi30	1,1,kh_rossi,220,235
+kh_rossi,188,230,0	warp	rossi31	1,1,kh_rossi,148,187
+kh_rossi,148,191,0	warp	rossi32	1,1,kh_rossi,188,234
+kh_rossi,204,230,0	warp	rossi33	1,1,kh_rossi,204,187
+kh_rossi,204,191,0	warp	rossi34	1,1,kh_rossi,204,234
+kh_rossi,220,230,0	warp	rossi35	1,1,kh_rossi,260,187
+kh_rossi,260,191,0	warp	rossi36	1,1,kh_rossi,220,234
\ No newline at end of file
diff --git a/npc/warps/other/other.txt b/npc/warps/other/other.txt
index 1760f7ec6..2359c9059 100644
--- a/npc/warps/other/other.txt
+++ b/npc/warps/other/other.txt
@@ -12,24 +12,24 @@
 //= Split off npc_warp.txt
 //============================================================
 
-//guild_room.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs1.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs1.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs1.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs1.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs2.gat,50,88,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs2.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs2.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs2.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs3.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs3.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs3.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs3.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs4.gat,7,50,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs4.gat,50,7,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs4.gat,92,50,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs4.gat,50,92,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs5.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs5.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs5.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0
-//guild_vs5.gat,0,0,0	warp	warp4	0,0,hoge.gat,0,0
\ No newline at end of file
+//guild_room,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs1,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs1,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs1,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs1,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs2,50,88,0	warp	warp4	0,0,hoge,0,0
+//guild_vs2,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs2,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs2,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs3,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs3,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs3,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs3,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs4,7,50,0	warp	warp4	0,0,hoge,0,0
+//guild_vs4,50,7,0	warp	warp4	0,0,hoge,0,0
+//guild_vs4,92,50,0	warp	warp4	0,0,hoge,0,0
+//guild_vs4,50,92,0	warp	warp4	0,0,hoge,0,0
+//guild_vs5,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs5,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs5,0,0,0	warp	warp4	0,0,hoge,0,0
+//guild_vs5,0,0,0	warp	warp4	0,0,hoge,0,0
\ No newline at end of file
diff --git a/npc/warps/other/sign.txt b/npc/warps/other/sign.txt
index d79254a1b..1cefe989f 100644
--- a/npc/warps/other/sign.txt
+++ b/npc/warps/other/sign.txt
@@ -14,25 +14,25 @@
 //= 1.2 Completed the warps [MasterOfMuppets]
 //============================================================
 
-cmd_in01.gat,17,34,0	warp	sign01	1,1,comodo.gat,187,164
+cmd_in01,17,34,0	warp	sign01	1,1,comodo,187,164
 
-geffen.gat,140,99,0	warp	sign02	1,1,geffen_in.gat,165,52
-geffen_in.gat,165,54,0	warp	sign02a	1,1,geffen.gat,138,101
+geffen,140,99,0	warp	sign02	1,1,geffen_in,165,52
+geffen_in,165,54,0	warp	sign02a	1,1,geffen,138,101
 
-himinn.gat,49,6,0	warp	sign03	1,1,gef_fild07.gat,179,241
+himinn,49,6,0	warp	sign03	1,1,gef_fild07,179,241
 
-himinn.gat,49,67,0	warp	sign04	1,1,himinn.gat,49,75
-himinn.gat,49,73,0	warp	sign04a	1,1,himinn.gat,49,65
+himinn,49,67,0	warp	sign04	1,1,himinn,49,75
+himinn,49,73,0	warp	sign04a	1,1,himinn,49,65
 
-um_in.gat,33,18,0	warp	sign05	1,1,um_in.gat,89,11
-um_in.gat,89,9,0	warp	sign05a	1,1,um_in.gat,33,16
+um_in,33,18,0	warp	sign05	1,1,um_in,89,11
+um_in,89,9,0	warp	sign05a	1,1,um_in,33,16
 
-um_dun01.gat,132,90,0	warp	sign06	1,1,um_in.gat,12,18
-um_in.gat,10,18,0	warp	sign06a	1,1,um_dun01.gat,129,90
+um_dun01,132,90,0	warp	sign06	1,1,um_in,12,18
+um_in,10,18,0	warp	sign06a	1,1,um_dun01,129,90
 
-que_sign01.gat,113,133,0	warp	sign07	1,1,nif_in.gat,117,173
+que_sign01,113,133,0	warp	sign07	1,1,nif_in,117,173
 
-que_sign01.gat,45,15,0	warp	sign08	1,1,niflheim.gat,146,245
+que_sign01,45,15,0	warp	sign08	1,1,niflheim,146,245
 
-que_sign02.gat,22,314,0	warp	sign09	1,1,niflheim.gat,30,156
-que_sign02.gat,379,235,0	warp	sign09a	1,1,que_sign01.gat,180,172
+que_sign02,22,314,0	warp	sign09	1,1,niflheim,30,156
+que_sign02,379,235,0	warp	sign09a	1,1,que_sign01,180,172
\ No newline at end of file