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, 77 insertions, 77 deletions

diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt
index bf38d1402..30682ad57 100644
--- a/npc/quests/first_class/tu_acolyte.txt
+++ b/npc/quests/first_class/tu_acolyte.txt
@@ -16,7 +16,7 @@
 
 
 //=================================================Priest Praupin====================================================
-prt_church.gat,179,15,1	script	Priest Praupin	110,{
+prt_church,179,15,1	script	Priest Praupin	110,{
 	mes "[Priest Praupin]";
 	if(BaseClass != Job_Acolyte){
 		if(tu_acolyte01 == 25){
@@ -65,7 +65,7 @@ prt_church.gat,179,15,1	script	Priest Praupin	110,{
 				mes "to Sister Asthe for me.";
 				mes "Have a safe trip, little one...";
 				close2;
-				warp "prt_monk.gat",30,250;
+				warp "prt_monk",30,250;
 				end;
 			} else {
 				mes "[Priest Praupin]";
@@ -150,7 +150,7 @@ prt_church.gat,179,15,1	script	Priest Praupin	110,{
 		mes "to Sister Asthe for me.";
 		mes "Have a safe trip, little one...";
 		close2;
-		warp "prt_monk.gat",30,250;
+		warp "prt_monk",30,250;
 		end;
 	} else {
 		mes "[Priest Praupin]";
@@ -164,7 +164,7 @@ prt_church.gat,179,15,1	script	Priest Praupin	110,{
 }
 
 //=================================================Asthe====================================================
-prt_monk.gat,230,106,3	script	Asthe#tu	79,{
+prt_monk,230,106,3	script	Asthe#tu	79,{
 	mes "[Asthe]";
 	switch(tu_acolyte01){
 	case 1:
@@ -785,7 +785,7 @@ prt_monk.gat,230,106,3	script	Asthe#tu	79,{
 
 
 //=================================================Priest Gardron====================================================
-monk_in.gat,18,38,6	script	Priest Gardron#tu	110,{
+monk_in,18,38,6	script	Priest Gardron#tu	110,{
 	mes "[Priest Gardron]";
 	if(tu_acolyte01 == 7){
 		if(countitem(7148) >= 1){
@@ -878,7 +878,7 @@ monk_in.gat,18,38,6	script	Priest Gardron#tu	110,{
 				mes "I shall send you";
 				mes "there to fight the monsters in Payon Dungeon so that you can return with 5 Decayed Nails. May God bless you...";
 				close2;
-				warp "payon.gat",161,58;
+				warp "payon",161,58;
 				end;
 			}
 			close;
@@ -894,7 +894,7 @@ monk_in.gat,18,38,6	script	Priest Gardron#tu	110,{
 }
 
 //=================================================Dog====================================================
-prt_monk.gat,235,245,5	script	Dog#tu	81,{
+prt_monk,235,245,5	script	Dog#tu	81,{
 	mes "[Dog]";
 	mes "^CDB79EBark bark!";
 	mes "Woof woof!^000000";
@@ -941,7 +941,7 @@ prt_monk.gat,235,245,5	script	Dog#tu	81,{
 }
 
 //=================================================Boy====================================================
-prt_monk.gat,243,238,5	script	Boy#boy_voi	139,5,5{
+prt_monk,243,238,5	script	Boy#boy_voi	139,5,5{
 OnTouch:
 	if(tu_acolyte01 != 10)end;
 	mes "[???]";
@@ -950,7 +950,7 @@ OnTouch:
 	close;
 }
 //=================================================Ill Girl====================================================
-prt_monk.gat,226,257,6	script	Ill Girl#tu	93,{
+prt_monk,226,257,6	script	Ill Girl#tu	93,{
 	mes "[Angelic]";
 	if(tu_acolyte01 > 12){
 		mes "Thanks for helping me.";
@@ -1140,7 +1140,7 @@ L_NONE:
 }
 
 //=================================================Veiner====================================================
-prt_monk.gat,197,228,3	script	Veiner	89,{
+prt_monk,197,228,3	script	Veiner	89,{
 	mes "[Veiner]";
 	if(countitem(1081) && tu_acolyte01 == 18){
 		set tu_acolyte01, 19;
@@ -1183,7 +1183,7 @@ prt_monk.gat,197,228,3	script	Veiner	89,{
 }
 
 //=================================================Hedrick====================================================
-prt_monk.gat,28,260,5	script	Hedrick	50,{
+prt_monk,28,260,5	script	Hedrick	50,{
 	mes "[Hedrick]";
 	mes "^333333*Whew!*^000000";
 	mes "Man I worked hard today!";
@@ -1218,7 +1218,7 @@ prt_monk.gat,28,260,5	script	Hedrick	50,{
 }
 
 //=================================================Weapon Merchant====================================================
-prt_monk.gat,135,263,4	script	Weapon Merchant#tu	139,9,9{
+prt_monk,135,263,4	script	Weapon Merchant#tu	139,9,9{
 OnTouch:
 	if(tu_acolyte01 != 20 || countitem(1081)==0) end;
 	delitem 1081, 1;
@@ -1235,7 +1235,7 @@ OnTouch:
 }
 
 //=================================================Karven====================================================
-monk_in.gat,103,176,7	script	Karven	60,{
+monk_in,103,176,7	script	Karven	60,{
 	mes "[Karven]";
 	mes "May you rest";
 	if(tu_acolyte01 == 21 && countitem(7183)){
@@ -1268,7 +1268,7 @@ monk_in.gat,103,176,7	script	Karven	60,{
 }
 
 //=================================================Gloria====================================================
-prt_monk.gat,219,164,3	script	Gloria#tu	95,{
+prt_monk,219,164,3	script	Gloria#tu	95,{
 	mes "[Gloria]";
 	if(BaseJob != Job_Acolyte){
 		mes "Hi, hi~";
@@ -1329,7 +1329,7 @@ prt_monk.gat,219,164,3	script	Gloria#tu	95,{
 			mes "Here we go~!!";
 			mes "W-warp Portal!";
 			close2;
-			warp "prontera.gat",116,72;
+			warp "prontera",116,72;
 			end;
 			break;
 		}
@@ -1341,7 +1341,7 @@ prt_monk.gat,219,164,3	script	Gloria#tu	95,{
 	close;
 }
 //=================================================Cleope Verce====================================================  
-prt_monk.gat,153,210,3	script	Cleope Verce	95,{
+prt_monk,153,210,3	script	Cleope Verce	95,{
 	mes "[Cleope Verce]";
 	if(BaseJob != Job_Acolyte){
 		mes "Hello hello.";
@@ -1521,7 +1521,7 @@ prt_monk.gat,153,210,3	script	Cleope Verce	95,{
 	close; 
 }
 //=================================================Range NPC====================================================  
-prt_monk.gat,217,123,4	script	#tu_monk	139,10,10{
+prt_monk,217,123,4	script	#tu_monk	139,10,10{
 OnTouch:
 	if(BaseJob == Job_Acolyte){
 		switch(tu_acolyte01){
@@ -1550,7 +1550,7 @@ OnTouch:
 	end;
 }
 //=================================================Eavesdrop====================================================  
-prt_monk.gat,223,123,3	script	Eavesdrop#tu	111,{
+prt_monk,223,123,3	script	Eavesdrop#tu	111,{
 	if(BaseJob != Job_Acolyte){
 		mes "^3355FFThere's nothing here.^000000";
 		close;
diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index eb95bcc66..f1c2ee2ae 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -18,7 +18,7 @@
 
 
 //=================================================Bard Jet====================================================
-payon_in02.gat,67,65,3	script	Bard Jet#tu	51,{
+payon_in02,67,65,3	script	Bard Jet#tu	51,{
 	mes "[Jet]";
 	mes "Every god never grows old";
 	mes "Because of beautiful";
@@ -163,7 +163,7 @@ payon_in02.gat,67,65,3	script	Bard Jet#tu	51,{
 }
 
 //=================================================Sign====================================================
-pay_arche.gat,127,154,4	script	Sign#arc	835,{
+pay_arche,127,154,4	script	Sign#arc	835,{
 	mes " ";
 	mes " Archer Job Change Office  --->  ";
 	mes " <---     Icarus  ";
@@ -172,7 +172,7 @@ pay_arche.gat,127,154,4	script	Sign#arc	835,{
 }
 
 //=================================================Master Kavaruk====================================================
-payon_in02.gat,47,13,3	script	Master Kavaruk	55,{
+payon_in02,47,13,3	script	Master Kavaruk	55,{
 
 	mes "[Master Kavaruk]";
 	mes "Hello, young one.";
@@ -412,7 +412,7 @@ payon_in02.gat,47,13,3	script	Master Kavaruk	55,{
 }
 
 //=================================================Raiden Karus====================================================
-pay_arche.gat,103,165,5	script	Raiden Karus#tu	832,{
+pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 
 	mes "[Raiden Karus]";
 	if(MaxWeight - Weight < 2000){
@@ -578,7 +578,7 @@ pay_arche.gat,103,165,5	script	Raiden Karus#tu	832,{
 								mes "Off you go!";
 								mes "To Prontera!";
 								close2;
-								warp "prontera.gat",116,72;
+								warp "prontera",116,72;
 								end;
 								break;
 							case 2:
@@ -746,7 +746,7 @@ pay_arche.gat,103,165,5	script	Raiden Karus#tu	832,{
 					mes "Alright...!";
 					mes "Get a move on!";
 					close2;
-					warp "prontera.gat",116,72;
+					warp "prontera",116,72;
 					end;
 					break;
 				case 2:
@@ -786,7 +786,7 @@ pay_arche.gat,103,165,5	script	Raiden Karus#tu	832,{
 					mes "Alright...!";
 					mes "Get a move on!";
 					close2;
-					warp "prontera.gat",116,72;
+					warp "prontera",116,72;
 					end;
 					break;
 				case 2:
@@ -1039,7 +1039,7 @@ pay_arche.gat,103,165,5	script	Raiden Karus#tu	832,{
 					mes "the chance, give a hello to my Acolyte pal over there for me~";
 					emotion e_heh;
 					close2;
-					warp "mjolnir_11.gat",25,221;
+					warp "mjolnir_11",25,221;
 					end;
 					break;
 				case 2:
@@ -1131,7 +1131,7 @@ pay_arche.gat,103,165,5	script	Raiden Karus#tu	832,{
 }
 
 //=================================================Arepesto====================================================
-pay_arche.gat,109,169,3	script	Arpesto	712,{
+pay_arche,109,169,3	script	Arpesto	712,{
 	mes "[Arpesto]";
 	mes "The sky still looks clear, but recently the winds that have been blowing through the land seem to carry with them an air of misfortune.";
 	next;
@@ -1151,7 +1151,7 @@ pay_arche.gat,109,169,3	script	Arpesto	712,{
 }
 
 //=================================================Seisner====================================================
-pay_arche.gat,84,139,3	script	Seisner	727,{
+pay_arche,84,139,3	script	Seisner	727,{
 	//misceffect EF_HIT2;
 	mes "[Seisner]";
 	mes "Aaaah!";
@@ -1355,10 +1355,10 @@ pay_arche.gat,84,139,3	script	Seisner	727,{
 }
 
 //=================================================Target====================================================
-pay_arche.gat,76,135,3	script	Target#Target	111,{ end; }	// empty NPC?? [Jukka]
+pay_arche,76,135,3	script	Target#Target	111,{ end; }	// empty NPC?? [Jukka]
 
 //=================================================Acolyte====================================================
-mjolnir_11.gat,27,223,3	script	Acolyte#tu	95,{
+mjolnir_11,27,223,3	script	Acolyte#tu	95,{
 	mes "[Acolyte]";
 	if(tu_archer01 == 14){
 		if(gettime(3) >= 18 && gettime(3) < 22){
@@ -1560,7 +1560,7 @@ mjolnir_11.gat,27,223,3	script	Acolyte#tu	95,{
 }
 
 //=================================================Alchemist Guildmember====================================================
-pay_arche.gat,130,113,3	script	Alchemist Guildmember#tu	740,{
+pay_arche,130,113,3	script	Alchemist Guildmember#tu	740,{
 	mes "[Alchemist Guildmember]";
 	if(tu_archer02 > 0){
 		if((countitem(1032) > 0) || (countitem(905) > 0 )){	// Blossom_Of_Maneater & Stem
@@ -1635,7 +1635,7 @@ pay_arche.gat,130,113,3	script	Alchemist Guildmember#tu	740,{
 }
 
 //=================================================Arthail====================================================
-prontera.gat,126,335,5	script	Arthail	51,{
+prontera,126,335,5	script	Arthail	51,{
 	mes "[Arthail]";
 	if(tu_archer02 < 3){
 		mes "I am the Bard";
@@ -1818,7 +1818,7 @@ prontera.gat,126,335,5	script	Arthail	51,{
 }
 
 //=================================================New Guild Master====================================================
-prontera.gat,167,281,3	script	New Guild Master#tu	753,{
+prontera,167,281,3	script	New Guild Master#tu	753,{
 	mes "[New Guild Master]";
 	mes "Hearken, all";
 	mes "of you who seek";
@@ -1840,7 +1840,7 @@ prontera.gat,167,281,3	script	New Guild Master#tu	753,{
 }
 
 //=================================================Mage====================================================
-prontera.gat,144,301,5	script	Mage#tu	123,{
+prontera,144,301,5	script	Mage#tu	123,{
 	mes "[Mage]";
 	mes "Did you see that";
 	mes "new guild master?";
@@ -1867,7 +1867,7 @@ prontera.gat,144,301,5	script	Mage#tu	123,{
 }
 
 //=================================================Minister====================================================
-prt_castle.gat,76,165,6	script	Minister#tu	55,{
+prt_castle,76,165,6	script	Minister#tu	55,{
 	mes "[Minister]";
 	mes "The royal family";
 	mes "is extremely busy";
@@ -1938,7 +1938,7 @@ OnTouch:
 }
 
 //=================================================Bishop Maugins====================================================
-monk_in.gat,19,43,1	script	Bishop Maugins	60,{
+monk_in,19,43,1	script	Bishop Maugins	60,{
 	mes "[Bishop Maugins]";
 	if(vu_archer02 == 7){
 		mes "Greetings.";
diff --git a/npc/quests/first_class/tu_ma_th01.txt b/npc/quests/first_class/tu_ma_th01.txt
index 2ef6c2893..4c60ce1a2 100644
--- a/npc/quests/first_class/tu_ma_th01.txt
+++ b/npc/quests/first_class/tu_ma_th01.txt
@@ -16,7 +16,7 @@
 
 
 //=================================================Battle Traces 1====================================================
-moc_fild12.gat,166,369,0	script	battle_traces#1	844,{
+moc_fild12,166,369,0	script	battle_traces#1	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 5){
 			mes "^3355FFThere are traces of poison used in a battle. You can sense its power and decide that it would be safer not to get too close to it.^000000";
@@ -63,7 +63,7 @@ moc_fild12.gat,166,369,0	script	battle_traces#1	844,{
 }
 
 //=================================================Battle Traces 2====================================================
-moc_fild12.gat,173,215,0	script	Battle Traces#2	844,{
+moc_fild12,173,215,0	script	Battle Traces#2	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 9){
 			mes "There are traces of many people going by.";
@@ -94,7 +94,7 @@ moc_fild12.gat,173,215,0	script	Battle Traces#2	844,{
 }
 
 //=================================================Battle Traces 3====================================================
-moc_fild12.gat,276,165,0	script	battle_traces#3	844,{
+moc_fild12,276,165,0	script	battle_traces#3	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 10){
 			mes "There are traces of several who have went by.";
@@ -125,7 +125,7 @@ moc_fild12.gat,276,165,0	script	battle_traces#3	844,{
 }
 
 //=================================================Battle Traces 4====================================================
-moc_fild11.gat,39,163,0	script	battle_traces#4	844,{
+moc_fild11,39,163,0	script	battle_traces#4	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 11){
 			mes "There are traces of many that have gone by.";
@@ -158,7 +158,7 @@ moc_fild11.gat,39,163,0	script	battle_traces#4	844,{
 }
 
 //=================================================Battle Traces 5====================================================
-moc_fild11.gat,205,52,0	script	battle_traces#5	844,{
+moc_fild11,205,52,0	script	battle_traces#5	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 12){
 			mes "There are traces of many that have gone by.";
@@ -260,7 +260,7 @@ moc_fild11.gat,205,52,0	script	battle_traces#5	844,{
 }
 
 //=================================================Battle Traces 6====================================================
-moc_fild11.gat,226,235,0	script	battle_traces#6	844,{
+moc_fild11,226,235,0	script	battle_traces#6	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 13){
 			mes "There are traces of many that have gone by.";
@@ -283,7 +283,7 @@ moc_fild11.gat,226,235,0	script	battle_traces#6	844,{
 }
 
 //=================================================Battle Traces 7====================================================
-moc_fild11.gat,184,342,0	script	battle_traces#7	844,{
+moc_fild11,184,342,0	script	battle_traces#7	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 13){
 			mes "There are traces of several that have stopped by.";
@@ -306,7 +306,7 @@ moc_fild11.gat,184,342,0	script	battle_traces#7	844,{
 }
 
 //=================================================Battle Traces 8====================================================
-moc_fild17.gat,213,358,0	script	battle_traces#8	844,{
+moc_fild17,213,358,0	script	battle_traces#8	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 13){
 			mes "There are traces of about two people that stopped by.";
@@ -337,7 +337,7 @@ moc_fild17.gat,213,358,0	script	battle_traces#8	844,{
 }
 
 //=================================================Battle Traces 9====================================================
-moc_fild17.gat,228,274,0	script	battle_traces#9	844,{
+moc_fild17,228,274,0	script	battle_traces#9	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 14){
 			mes "There are traces of a small battle.";
@@ -396,7 +396,7 @@ moc_fild17.gat,228,274,0	script	battle_traces#9	844,{
 }
 
 //=================================================Battle Traces 10====================================================
-moc_fild17.gat,34,292,0	script	battle_traces#10	844,{
+moc_fild17,34,292,0	script	battle_traces#10	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 16){
 			mes "A large group of people seem to have gone by.";
@@ -427,7 +427,7 @@ moc_fild17.gat,34,292,0	script	battle_traces#10	844,{
 }
 
 //=================================================Battle Traces 11====================================================
-moc_fild18.gat,346,296,0	script	battle_traces#11	844,{
+moc_fild18,346,296,0	script	battle_traces#11	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 17){
 			mes "A large group of people seem to have gone by.";
@@ -458,7 +458,7 @@ moc_fild18.gat,346,296,0	script	battle_traces#11	844,{
 }
 
 //=================================================Battle Traces 12====================================================
-moc_fild18.gat,309,257,0	script	battle_traces#12	844,{
+moc_fild18,309,257,0	script	battle_traces#12	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 18){
 			mes "A large group of people seem to have gone by.";
@@ -489,7 +489,7 @@ moc_fild18.gat,309,257,0	script	battle_traces#12	844,{
 }
 
 //=================================================Battle Traces 13====================================================
-moc_fild18.gat,177,333,0	script	battle_traces#13	844,{
+moc_fild18,177,333,0	script	battle_traces#13	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 19){
 			mes "A large group of people seem to have gone by.";
@@ -520,7 +520,7 @@ moc_fild18.gat,177,333,0	script	battle_traces#13	844,{
 }
 
 //=================================================Battle Traces 14====================================================
-moc_fild18.gat,111,303,0	script	battle_traces#14	844,{
+moc_fild18,111,303,0	script	battle_traces#14	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 20){
 			mes "A large group of people seem to have gone by.";
@@ -551,7 +551,7 @@ moc_fild18.gat,111,303,0	script	battle_traces#14	844,{
 }
 
 //=================================================Battle Traces 15====================================================
-moc_fild18.gat,109,197,0	script	battle_traces#15	844,{
+moc_fild18,109,197,0	script	battle_traces#15	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 21){
 			mes "A large group of people seem to have gone by.";
@@ -713,7 +713,7 @@ moc_fild18.gat,109,197,0	script	battle_traces#15	844,{
 }
 
 //=================================================Battle Traces 16====================================================
-moc_fild18.gat,156,96,0	script	battle_traces#16	844,{
+moc_fild18,156,96,0	script	battle_traces#16	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 25){
 			mes "A large group of people seem to have gone by.";
diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt
index 11203fd7d..c6824cf21 100644
--- a/npc/quests/first_class/tu_magician01.txt
+++ b/npc/quests/first_class/tu_magician01.txt
@@ -16,7 +16,7 @@
 
 
 //=================================================Sign====================================================
-geffen.gat,61,174,4	script	Sign#M	111,{
+geffen,61,174,4	script	Sign#M	111,{
   mes "~sign reads...~";
   mes "Greetings!! This is the Geffen Magic Academy.  Come in if you have an interest in all things magic!";
   close;
@@ -24,7 +24,7 @@ geffen.gat,61,174,4	script	Sign#M	111,{
 
 
 //=================================================New Mage Manager====================================================
-geffen.gat,67,180,4	script	New Mage Manager#M	102,{
+geffen,67,180,4	script	New Mage Manager#M	102,{
 	mes "[Mana]";
 	if(Class == Job_Novice){
 		mes "[Mana]";
@@ -694,7 +694,7 @@ geffen.gat,67,180,4	script	New Mage Manager#M	102,{
 			mes "Hoho..";
 			set tu_magician01, 7;
 			emotion e_heh;
-			warp "morocc.gat",182,286;
+			warp "morocc",182,286;
 			close;
 		} else {
 			mes "[Mana]";
diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt
index 5c5c8ac88..4244927da 100644
--- a/npc/quests/first_class/tu_merchant.txt
+++ b/npc/quests/first_class/tu_merchant.txt
@@ -16,7 +16,7 @@
 
 
 //=================================================Guarnien====================================================
-alberta_in.gat,70,51,5	script	Guarnien	98,{
+alberta_in,70,51,5	script	Guarnien	98,{
 	mes "[Guarnien]";
 	if(Class != Job_Merchant && Class != Job_Baby_Merchant){
 		mes "Hello stranger.";
@@ -426,7 +426,7 @@ alberta_in.gat,70,51,5	script	Guarnien	98,{
 		mes "some reason --to send you there right now. Get ready...!";
 		next;
 		set tu_merchant, rand(6,8);
-		warp "prontera.gat",155,46;
+		warp "prontera",155,46;
 		close2;
 		end;
 		break;
@@ -676,7 +676,7 @@ alberta_in.gat,70,51,5	script	Guarnien	98,{
 }
 	
 //=================================================Sagle====================================================
-prontera.gat,66,111,3	script	Sagle	82,{
+prontera,66,111,3	script	Sagle	82,{
 	mes "[Sagle]";
 	if(tu_merchant == 8){
 		mes "Hello, hello~";
@@ -840,7 +840,7 @@ prontera.gat,66,111,3	script	Sagle	82,{
 }
 
 //=================================================Kellion====================================================
-prontera.gat,93,330,3	script	Kellion	97,{
+prontera,93,330,3	script	Kellion	97,{
 	mes "[Kellion]";
 	if(tu_merchant == 8){
 		mes "I'm selling sets of";
@@ -979,7 +979,7 @@ prontera.gat,93,330,3	script	Kellion	97,{
 }
 	
 //=================================================Aigie====================================================
-prt_in.gat,169,11,3	script	Aigie	92,{
+prt_in,169,11,3	script	Aigie	92,{
 	if(tu_merchant == 8){
 		mes "[Aigie]";
 		mes "Welcome to my shop.";
@@ -1130,7 +1130,7 @@ prt_in.gat,169,11,3	script	Aigie	92,{
 }
 	
 //=================================================Jayon====================================================
-prontera.gat,247,129,3	script	Jayon	85,{
+prontera,247,129,3	script	Jayon	85,{
 	if(tu_merchant == 8){
 		mes "[Jayon]";
 		mes "If you've checked out the market for Red Potions, you know that my price is the best. I'm offering 10 Red Potions for only 410 Zeny!";
@@ -1287,7 +1287,7 @@ prontera.gat,247,129,3	script	Jayon	85,{
 }
 
 //=================================================Maos====================================================
-prt_in.gat,251,129,3	script	Maos	709,{
+prt_in,251,129,3	script	Maos	709,{
 	if(tu_merchant == 8){
 		mes "[Maos]";
 		mes "Don't say anything.";
diff --git a/npc/quests/first_class/tu_sword.txt b/npc/quests/first_class/tu_sword.txt
index 4c87a4bd0..a1a6e6e8a 100644
--- a/npc/quests/first_class/tu_sword.txt
+++ b/npc/quests/first_class/tu_sword.txt
@@ -16,7 +16,7 @@
 
 
 //=================================================Shurank====================================================
-izlude_in.gat,82,163,3	script	Shurank	733,{
+izlude_in,82,163,3	script	Shurank	733,{
 	mes "[Shurank]";
 	if(Class == Job_Novice || Class == Job_Baby){
 		mes "Still wondering";
@@ -571,7 +571,7 @@ izlude_in.gat,82,163,3	script	Shurank	733,{
 		mes "[Shurank]";
 		mes "But now that I think about it, it may take you a while to travel to Geffen. I shall send you there myself! Good luck!";
 		next;
-		warp "gef_fild07.gat",35,192;
+		warp "gef_fild07",35,192;
 		close;
 		break;
 	case 5:
@@ -909,7 +909,7 @@ izlude_in.gat,82,163,3	script	Shurank	733,{
 }
 
 //=================================================Daqu'ee====================================================
-geffen.gat,154,143,3	script	Dequ'ee	734,{ 
+geffen,154,143,3	script	Dequ'ee	734,{ 
 	if(BaseJob == Job_Novice){
 		mes "[Dequ'ee]";
 		mes "Hey there.";
@@ -991,7 +991,7 @@ if(tu_swordman == 20){
 	mes "wants to show you the ropes of Swordmanship.";
 	set tu_swordman, 21;
 	close2;
-	warp "izlude.gat",35,78;
+	warp "izlude",35,78;
 	end;
 }
 
@@ -1053,7 +1053,7 @@ if((tu_swordman == 17) || (tu_swordman == 18)){
 			set tu_swordman, 19;
 			set BaseExp, BaseExp + 1620;
 			close2;
-			warp "moc_fild07.gat",359,201;
+			warp "moc_fild07",359,201;
 			end;
 			break;
 		case 3:
@@ -1945,7 +1945,7 @@ if(tu_swordman == 13){
 	mes "near that city.";
 	next;
 	set tu_swordman, 14;
-	warp "moc_fild07.gat",359,201;
+	warp "moc_fild07",359,201;
 	close;
 }
 
@@ -2154,7 +2154,7 @@ if(tu_swordman == 6){
 							mes "of yourself,";
 							mes "brave Swordman.";
 							next;
-							warp "izlude.gat",35,78;
+							warp "izlude",35,78;
 							close;
 							break;
 					}
@@ -2219,7 +2219,7 @@ if(tu_swordman == 6){
 }
 
 //=================================================Geil====================================================
-morocc_in.gat,51,101,3	script	Geil	89,{
+morocc_in,51,101,3	script	Geil	89,{
 	mes "[Geil]";
 	if(tu_swordman == 15){
 		mes "Were you sent by the authorities? Quit giving me such a hard time! I'm not the murderer! I don't even know who was killed. I'm not the one you're looking for!";
@@ -2271,7 +2271,7 @@ morocc_in.gat,51,101,3	script	Geil	89,{
 }
 
 //=================================================Meutro====================================================		
-morocc.gat,82,292,5	script	Muetro	84,{
+morocc,82,292,5	script	Muetro	84,{
 	mes "[Muetro]";
 	if(tu_swordman == 15){
 		mes "You're just";
@@ -2311,7 +2311,7 @@ morocc.gat,82,292,5	script	Muetro	84,{
 }
 
 //=================================================Hans====================================================
-morocc.gat,240,72,3	script	Hans	86,{
+morocc,240,72,3	script	Hans	86,{
 	mes "[Hans]";
 	if(tu_swordman == 15){
 		mes "Help me!";
@@ -2368,7 +2368,7 @@ morocc.gat,240,72,3	script	Hans	86,{
 }
 	
 //=================================================Bankley====================================================
-morocc_in.gat,12,156,3	script	Bankley	97,{
+morocc_in,12,156,3	script	Bankley	97,{
 	if(tu_swordman > 19){
 		mes "^3355FFBankley had a pitiable";
 		mes "expression on his face.^000000";
diff --git a/npc/quests/first_class/tu_thief01.txt b/npc/quests/first_class/tu_thief01.txt
index 715073248..0cc183be8 100644
--- a/npc/quests/first_class/tu_thief01.txt
+++ b/npc/quests/first_class/tu_thief01.txt
@@ -15,7 +15,7 @@
 //============================================================ 
 
 //=================================================Thief Trainer====================================================
-moc_ruins.gat,66,164,4	script	Thief Trainer#T	84,{
+moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 	mes "[Yierhan]";
 	if(Class == Job_Novice){
 		mes "Eh...?";
@@ -371,13 +371,13 @@ moc_ruins.gat,66,164,4	script	Thief Trainer#T	84,{
 			mes "10 ^ff0000Feather of Birds^000000.";
 			mes "You can go ahead and kill Pickies to get those. It really shouldn't be that hard. Oh, and use this Wing thingee to come back.";
 			set tu_thief01, 5;
-			savepoint "moc_ruins.gat",80,164;
+			savepoint "moc_ruins",80,164;
 			getitem 602, 1;
 			set BaseExp, BaseExp + 100;
 			set JobExp, JobExp + 50;
 			//misceffect EF_HIT5;
 			close2;
-			warp "moc_fild12.gat",158,373;
+			warp "moc_fild12",158,373;
 			end;
 		} else if(tu_thief01 == 5 || tu_thief01 == 6){
 			if(countitem(916) < 10){	//Feather_Of_Birds
@@ -386,7 +386,7 @@ moc_ruins.gat,66,164,4	script	Thief Trainer#T	84,{
 				mes "Remember, experience is more important";
 				mes "that knowledge.";
 				close2;
-				warp "moc_fild07.gat",203,38;
+				warp "moc_fild07",203,38;
 				end;
 			} else {
 				mes "Ah~ there you go.";