Fix some NPC (etc) map names

38 files changed, 97 insertions, 87 deletions

diff --git a/npc/001-1_Tulimshar/banker.txt b/npc/001-1_Tulimshar/banker.txt
index 9431f5cc..f94ea304 100644
--- a/npc/001-1_Tulimshar/banker.txt
+++ b/npc/001-1_Tulimshar/banker.txt
@@ -1,4 +1,4 @@
-new_3-1.gat,57,52,0	script	Tybalt	107,{
+001-1.gat,57,52,0	script	Tybalt	107,{
 	set @npcName$, "Tybalt";
 	callfunc "Banker";
 }
diff --git a/npc/001-1_Tulimshar/barber.txt b/npc/001-1_Tulimshar/barber.txt
index bd6b148e..502e5401 100644
--- a/npc/001-1_Tulimshar/barber.txt
+++ b/npc/001-1_Tulimshar/barber.txt
@@ -1,4 +1,6 @@
-new_3-1.gat,53,38,0	script	Nicolas	100,{
+//
+
+001-1.gat,53,38,0	script	Nicolas	100,{
 	mes "[Nicolas the Barber]";
 	mes "\"Do you need a barber?\"";
 	next;
diff --git a/npc/001-1_Tulimshar/bard.txt b/npc/001-1_Tulimshar/bard.txt
index dcb56424..8d53fc72 100644
--- a/npc/001-1_Tulimshar/bard.txt
+++ b/npc/001-1_Tulimshar/bard.txt
@@ -1,6 +1,6 @@
 //
 
-new_3-1.gat,50,44,0	script	Bard	152,{
+001-1.gat,50,44,0	script	Bard	152,{
 	setarray @songs$, "\"There once was a bard, who had it hard, because a man in dark green, was very mean.\"",
 			"\"At Hurnscald inn, there was a person of fairest skin, declining wedding bands from quite a many hands.\"",
 			"\"As the Sun sets down in the forest's brown, she whom the fragrance holds counts her gold.\"";
diff --git a/npc/001-1_Tulimshar/bleacher.txt b/npc/001-1_Tulimshar/bleacher.txt
index 6a15e273..06d7495a 100644
--- a/npc/001-1_Tulimshar/bleacher.txt
+++ b/npc/001-1_Tulimshar/bleacher.txt
@@ -1,6 +1,6 @@
 //
 
-new_3-1.gat,27,53,0	script	Candide	156,{
+001-1.gat,27,53,0	script	Candide	156,{
     mes "[Candide]";
     mes "\"I've figured out how that volcanic ash bleaches cloth.";
     mes "I could do it for you, but I'll need three piles of ash and 5,000 GP for supplies per item.\"";
diff --git a/npc/001-1_Tulimshar/children.txt b/npc/001-1_Tulimshar/children.txt
index 40efb233..f14a2509 100644
--- a/npc/001-1_Tulimshar/children.txt
+++ b/npc/001-1_Tulimshar/children.txt
@@ -1,4 +1,6 @@
-new_3-1.gat,94,27,0	script	Aisha	108,{
+//
+
+001-1.gat,94,27,0	script	Aisha	108,{
 	set @TEMP,rand(9);
 	if(@TEMP == 0) goto L_1;
 	if(@TEMP == 1) goto L_1;
diff --git a/npc/001-1_Tulimshar/constable.txt b/npc/001-1_Tulimshar/constable.txt
index 673ff0a0..c07889c6 100644
--- a/npc/001-1_Tulimshar/constable.txt
+++ b/npc/001-1_Tulimshar/constable.txt
@@ -1,6 +1,6 @@
 //
 
-new_3-1.gat,37,35,0	script	Constable Perry Graf	150,{
+001-1.gat,37,35,0	script	Constable Perry Graf	150,{
 //	set @npcName$, "Constable Perry Graf";
 	set @canSkip, 1;
 	callfunc "GameRules";
diff --git a/npc/001-1_Tulimshar/elanore.txt b/npc/001-1_Tulimshar/elanore.txt
index cc474ca0..4171e54f 100644
--- a/npc/001-1_Tulimshar/elanore.txt
+++ b/npc/001-1_Tulimshar/elanore.txt
@@ -1,6 +1,6 @@
-//Heal NPC costs 100 money
+//
 
-new_3-1.gat,58,68,0	script	Elanore	108,{
+001-1.gat,58,68,0	script	Elanore	108,{
 
 	if (baselevel > 10) goto L_NoHeal;
 
diff --git a/npc/001-1_Tulimshar/guards.txt b/npc/001-1_Tulimshar/guards.txt
index 158a00a1..c5433286 100644
--- a/npc/001-1_Tulimshar/guards.txt
+++ b/npc/001-1_Tulimshar/guards.txt
@@ -1,4 +1,6 @@
-new_3-1.gat,48,79,0	script	Ekinu	104,{
+//
+
+001-1.gat,48,79,0	script	Ekinu	104,{
 	mes "[Ekinu the Town Guard]";
 	mes "\"What a disaster... I can't believe that we managed to rebuild the town so fast, though.\"";
 	next;
diff --git a/npc/001-1_Tulimshar/guide.txt b/npc/001-1_Tulimshar/guide.txt
index b1458919..1efc79fe 100644
--- a/npc/001-1_Tulimshar/guide.txt
+++ b/npc/001-1_Tulimshar/guide.txt
@@ -1,4 +1,6 @@
-new_3-1.gat,33,27,0	script	Ian	102,{
+//
+
+001-1.gat,33,27,0	script	Ian	102,{
 	if (TUT_var & 1 == 1 && TUT_var & 2 == 0 && BaseLevel >= 10) callsub S_Grad;
 	mes "[Ian the Guide]";
 	mes "\"Would you like to know about something?\"";
diff --git a/npc/001-1_Tulimshar/man.txt b/npc/001-1_Tulimshar/man.txt
index f2638a51..804acf8e 100644
--- a/npc/001-1_Tulimshar/man.txt
+++ b/npc/001-1_Tulimshar/man.txt
@@ -1,4 +1,6 @@
-new_3-1.gat,108,55,0	script	Luca	102,{
+//
+
+001-1.gat,108,55,0	script	Luca	102,{
 	mes "[Luca the Hunter]";
 	mes "\"Ouch! It hurts, this wound I got from battle.\"";
 	next;
diff --git a/npc/001-1_Tulimshar/merchant.txt b/npc/001-1_Tulimshar/merchant.txt
index 186365d6..74e994f4 100644
--- a/npc/001-1_Tulimshar/merchant.txt
+++ b/npc/001-1_Tulimshar/merchant.txt
@@ -1 +1,3 @@
-new_3-1.gat,39,52,0	shop	Neko	101,501:50,502:60,1201:100,522:300,521:1000,656:250,1202:1000,523:8000,603:-1
+//
+
+001-1.gat,39,52,0	shop	Neko	101,501:50,502:60,1201:100,522:300,521:1000,656:250,1202:1000,523:8000,603:-1
diff --git a/npc/001-1_Tulimshar/monster_guide.txt b/npc/001-1_Tulimshar/monster_guide.txt
index 3b2d8b6f..23392b2d 100644
--- a/npc/001-1_Tulimshar/monster_guide.txt
+++ b/npc/001-1_Tulimshar/monster_guide.txt
@@ -1,4 +1,6 @@
-new_3-1.gat,48,52,0	script	Aidan	102,{
+//
+
+001-1.gat,48,52,0	script	Aidan	102,{
 	if(MPQUEST == 0) goto Register;
 	mes "[Aidan the Monster Guide]";
 	mes "You currently have " +Mobpt+ " Monster Points. These points are acquired while killing monsters";
diff --git a/npc/001-1_Tulimshar/monsters.txt b/npc/001-1_Tulimshar/monsters.txt
index 1a17628f..1fc53d88 100644
--- a/npc/001-1_Tulimshar/monsters.txt
+++ b/npc/001-1_Tulimshar/monsters.txt
@@ -2,11 +2,11 @@
 // This is Tulimshar the city -- southern part with market and casino/inn.
 //
 
-new_3-1.gat,0,0,0,0	monster	Maggot		1002,35,2000,0,Mob3::OnMaggot
-new_3-1.gat,0,0,0,0	monster	Scorpion	1003,25,2500,0,Mob3::OnScorpion
-new_3-1.gat,0,0,0,0	monster	Firegoblin	1011,20,2500,0,Mob3::OnFireGoblin
+001-1.gat,0,0,0,0	monster	Maggot		1002,35,2000,0,Mob3::OnMaggot
+001-1.gat,0,0,0,0	monster	Scorpion	1003,25,2500,0,Mob3::OnScorpion
+001-1.gat,0,0,0,0	monster	Firegoblin	1011,20,2500,0,Mob3::OnFireGoblin
 
-new_3-1.gat,0,0,0	script	Mob3	-1,{
+001-1.gat,0,0,0	script	Mob3	-1,{
 OnMaggot:
 	set @mobID, 1002;
 	callfunc "MobPoints";
diff --git a/npc/001-1_Tulimshar/rewards_master.txt b/npc/001-1_Tulimshar/rewards_master.txt
index 9c0ddb43..657b82f4 100644
--- a/npc/001-1_Tulimshar/rewards_master.txt
+++ b/npc/001-1_Tulimshar/rewards_master.txt
@@ -1,4 +1,6 @@
-new_3-1.gat,50,53,0	script	Ishi	106,{
+//
+
+001-1.gat,50,53,0	script	Ishi	106,{
 	if (MPQUEST == 0) goto L_Register;
 	if (tvis == 0) set tvis, 1;
 	if (Mobpt < tvis) goto L_NotEnough;
diff --git a/npc/001-1_Tulimshar/rules.txt b/npc/001-1_Tulimshar/rules.txt
index 70917804..a67eeb14 100644
--- a/npc/001-1_Tulimshar/rules.txt
+++ b/npc/001-1_Tulimshar/rules.txt
@@ -1,6 +1,6 @@
 //
 
-new_3-1.gat,29,28,0	script	#Rules	127,1,1,{
+001-1.gat,29,28,0	script	#Rules	127,1,1,{
 	if (TUT_var & 1 == 1) close;
 	callfunc "GameRules";
 	mes "Ian, the trainer, can help you get to know the game.";
diff --git a/npc/001-1_Tulimshar/sandra.txt b/npc/001-1_Tulimshar/sandra.txt
index 4922bd60..eb1ebdf0 100644
--- a/npc/001-1_Tulimshar/sandra.txt
+++ b/npc/001-1_Tulimshar/sandra.txt
@@ -1,4 +1,6 @@
-new_3-1.gat,110,71,0	script	Sandra	114,{
+//
+
+001-1.gat,110,71,0	script	Sandra	114,{
 	if(Scorp == 2) goto done;
 	if(Scorp == 1) goto reas;
 	set @TEMP,rand(3);
diff --git a/npc/001-1_Tulimshar/soul-menhir.txt b/npc/001-1_Tulimshar/soul-menhir.txt
index 147ed63d..45c5dfea 100644
--- a/npc/001-1_Tulimshar/soul-menhir.txt
+++ b/npc/001-1_Tulimshar/soul-menhir.txt
@@ -1,5 +1,7 @@
-new_3-1.gat,38,69,0	script	Soul Menhir	144, {
-	set @map$, "new_3-1.gat";
+//
+
+001-1.gat,38,69,0	script	Soul Menhir	144, {
+	set @map$, "001-1.gat";
 	set @x, 38;
 	set @y, 70;
 	callfunc "SoulMenhir";
diff --git a/npc/001-1_Tulimshar/vincent.txt b/npc/001-1_Tulimshar/vincent.txt
index 4e2a0926..ef17ba18 100644
--- a/npc/001-1_Tulimshar/vincent.txt
+++ b/npc/001-1_Tulimshar/vincent.txt
@@ -1,4 +1,6 @@
-new_3-1.gat,135,42,0	script	Vincent	113,{
+//
+
+001-1.gat,135,42,0	script	Vincent	113,{
 	if(Bugleg == 1) goto L_Reas;
 	if(Bugleg == 2) goto L_Done;
 	set @TEMP, rand(4);
diff --git a/npc/001-1_Tulimshar/workers.txt b/npc/001-1_Tulimshar/workers.txt
index 31c6afa3..43ee9795 100644
--- a/npc/001-1_Tulimshar/workers.txt
+++ b/npc/001-1_Tulimshar/workers.txt
@@ -1,12 +1,12 @@
 //
 
-new_3-1.gat,45,21,0	script	Construction Worker	155,{
+001-1.gat,45,21,0	script	Construction Worker	155,{
         mes "[Construction worker]";
 	mes "\"I can't let you beyond this gate.  The area is closed for renovation; most of it was destroyed during the earthquake.\"";
 	close;
 }
 
-new_3-1.gat,124,21,0	script	Construction Worker	155,{
+001-1.gat,124,21,0	script	Construction Worker	155,{
         mes "[Construction worker]";
 	mes "\"Move along.\"";
 	close;
diff --git a/npc/001-2_Tulimshar/casino.txt b/npc/001-2_Tulimshar/casino.txt
index 58f99ea5..b5da3933 100644
--- a/npc/001-2_Tulimshar/casino.txt
+++ b/npc/001-2_Tulimshar/casino.txt
@@ -1,26 +1,26 @@
 //
 
-new_8-1.gat,134,23,0	script	Valdo	117,{
+001-2.gat,134,23,0	script	Valdo	117,{
 	mes "[Valdo the Worker]";
 	mes "\"Please let me work, I'm really in a hurry!\"";
 	close;
 }
 
-new_8-1.gat,37,65,0	script	Slot1	127,{
+001-2.gat,37,65,0	script	Slot1	127,{
 	callfunc "SlotMachine";
 }
 
-new_8-1.gat,39,65,0	script	Slot2	127,{
+001-2.gat,39,65,0	script	Slot2	127,{
 	callfunc "SlotMachine";
 }
 
-new_8-1.gat,41,65,0	script	Slot3	127,{
+001-2.gat,41,65,0	script	Slot3	127,{
 	callfunc "SlotMachine";
 }
 
-new_8-1.gat,32,67,0	shop	MoneyChanger	124,503:10
+001-2.gat,32,67,0	shop	MoneyChanger	124,503:10
 
-new_8-1.gat,28,63,0	script	BlackJack	107,{
+001-2.gat,28,63,0	script	BlackJack	107,{
 	mes "[Croupier]";
 	mes "\"Would you like to play Black Jack?";
 	mes "You will need 15 casino coins.\"";
@@ -93,7 +93,7 @@ L_Ace:
 
 }
 
-new_8-1.gat,22,69,0	script	Roulette	107,{
+001-2.gat,22,69,0	script	Roulette	107,{
 	mes "\"Good evening monsieur...";
 	mes "How much would you like to bet?\"";
 	next;
diff --git a/npc/001-2_Tulimshar/omar.txt b/npc/001-2_Tulimshar/omar.txt
index 25865e5f..009e7b5d 100644
--- a/npc/001-2_Tulimshar/omar.txt
+++ b/npc/001-2_Tulimshar/omar.txt
@@ -1,6 +1,6 @@
 //
 
-new_8-1.gat,70,60,0	script	Omar	162,{
+001-2.gat,70,60,0	script	Omar	162,{
 	mes "[Omar]";
 	mes "\"Welcome to my humble abode.\"";
 }
diff --git a/npc/001-2_Tulimshar/phaet.txt b/npc/001-2_Tulimshar/phaet.txt
index 4cc13e9a..ec4ae6dc 100644
--- a/npc/001-2_Tulimshar/phaet.txt
+++ b/npc/001-2_Tulimshar/phaet.txt
@@ -1,6 +1,6 @@
 //
 
-new_8-1.gat,24,23,0	script	Phaet	125,{
+001-2.gat,24,23,0	script	Phaet	125,{
 	mes "[Phaet the Royal Guard]";
 	mes "\"Hey, you seem tough enough! Would you like to prove your skills? I'll let you in the arena if you give me 50 gp. You can fight against other players there.\"";
 	next;
diff --git a/npc/001-2_Tulimshar/shops.txt b/npc/001-2_Tulimshar/shops.txt
index 8482edd9..479969cd 100644
--- a/npc/001-2_Tulimshar/shops.txt
+++ b/npc/001-2_Tulimshar/shops.txt
@@ -1,8 +1,8 @@
 //
 
-new_8-1.gat,26,26,0	shop	InnKeeper	112,539:175,513:20,519
+001-2.gat,26,26,0	shop	InnKeeper	112,539:175,513:20,519
 
-new_8-1.gat,103,26,0	script	Rebecca	118,{
+001-2.gat,103,26,0	script	Rebecca	118,{
 	set @npcName$, "Rebecca the Inn Keeper";
 	set @cost, 100;
 	callfunc "Inn";
diff --git a/npc/001-2_Tulimshar/troupe_leader.txt b/npc/001-2_Tulimshar/troupe_leader.txt
index a602b1d2..1114de56 100644
--- a/npc/001-2_Tulimshar/troupe_leader.txt
+++ b/npc/001-2_Tulimshar/troupe_leader.txt
@@ -1,6 +1,6 @@
 //
 
-new_8-1.gat,34,25,0	script	Troupe Leader	165,{
+001-2.gat,34,25,0	script	Troupe Leader	165,{
 	if (Inspector == 4) goto L_NohMask_Troupe;
 	if (Inspector == 13) goto L_NohMask_Found;
 
diff --git a/npc/001-3_Tulimshar_arena/guards.txt b/npc/001-3_Tulimshar_arena/guards.txt
index 065ed765..56a677af 100644
--- a/npc/001-3_Tulimshar_arena/guards.txt
+++ b/npc/001-3_Tulimshar_arena/guards.txt
@@ -1,6 +1,6 @@
 //
 
-new_6-1.gat,77,37,0	script	Phaet	125,{
+001-3.gat,77,37,0	script	Phaet	125,{
 	mes "[Phaet the Royal Guard]";
 	mes "\"Do you want to go back?\"";
 	next;
@@ -20,7 +20,7 @@ L_Sure:
 	close;
 }
 
-new_6-1.gat,69,37,0	script	Aradin	126,{
+001-3.gat,69,37,0	script	Aradin	126,{
 	mes "[Aradin the Royal Guard]";
 	mes "\"Don't touch me...";
 	mes "You wouldn't enjoy the consequences.\"";
diff --git a/npc/001-3_Tulimshar_arena/monsters.txt b/npc/001-3_Tulimshar_arena/monsters.txt
index 51d72132..91fe96b3 100644
--- a/npc/001-3_Tulimshar_arena/monsters.txt
+++ b/npc/001-3_Tulimshar_arena/monsters.txt
@@ -2,9 +2,9 @@
 // This is the Tulimshar Arena -- below Tulimshar.
 //
 
-new_6-1.gat,0,0,0,0	monster	Maggot	1002,10,0,0,Mob6::OnMaggot
+001-3.gat,0,0,0,0	monster	Maggot	1002,10,0,0,Mob6::OnMaggot
 
-new_6-1.gat,0,0,0	script	Mob6	-1,{
+001-3.gat,0,0,0	script	Mob6	-1,{
 OnMaggot:
 	set @mobID, 1002;
 	callfunc "MobPoints";
diff --git a/npc/001-3_Tulimshar_arena/pvpflag.txt b/npc/001-3_Tulimshar_arena/pvpflag.txt
index 361e062b..73b6e556 100644
--- a/npc/001-3_Tulimshar_arena/pvpflag.txt
+++ b/npc/001-3_Tulimshar_arena/pvpflag.txt
@@ -1 +1 @@
-new_6-1.gat mapflag pvp
+001-3.gat mapflag pvp
diff --git a/npc/002-1_Sandstorm/dark_mage.txt b/npc/002-1_Sandstorm/dark_mage.txt
index 1bf8df8c..630d4471 100644
--- a/npc/002-1_Sandstorm/dark_mage.txt
+++ b/npc/002-1_Sandstorm/dark_mage.txt
@@ -1,4 +1,6 @@
-new_1-1.gat,24,24,0	script	SoulThief	103,{
+//
+
+002-1.gat,24,24,0	script	SoulThief	103,{
 
 	if (class == 1) goto L_Soul;
 	mes "[Dark Mage]";
@@ -43,4 +45,4 @@ L_Soul:
 	mes "\"Hrhrhr, your soul is finally mine!\"";
 	jobchange 1;
 	close;
-}
\ No newline at end of file
+}
diff --git a/npc/002-1_Sandstorm/merchant.txt b/npc/002-1_Sandstorm/merchant.txt
index d01a9164..8a84ae92 100644
--- a/npc/002-1_Sandstorm/merchant.txt
+++ b/npc/002-1_Sandstorm/merchant.txt
@@ -1 +1,3 @@
-new_1-1.gat,19,99,0     shop    Ishyah        109,525:800,531:3000,530:8000,1199:3,603:-1
+//
+
+002-1.gat,19,99,0     shop    Ishyah        109,525:800,531:3000,530:8000,1199:3,603:-1
diff --git a/npc/002-1_Sandstorm/monsters.txt b/npc/002-1_Sandstorm/monsters.txt
index a98c8406..a8406a7f 100644
--- a/npc/002-1_Sandstorm/monsters.txt
+++ b/npc/002-1_Sandstorm/monsters.txt
@@ -2,11 +2,11 @@
 // This is the Desert (Sandstorm) south of Tulimshar.
 //
 
-new_1-1.gat,0,0,0,0	monster	GreenSlime	1005,50,0,0,Mob1::OnGreenSlime
-new_1-1.gat,0,0,0,0	monster	GiantMaggot	1006,30,0,0,Mob1::OnGiantMaggot
-new_1-1.gat,0,0,0,0	monster	RedScorpion	1004,20,0,0,Mob1::OnRedScorpion
+002-1.gat,0,0,0,0	monster	GreenSlime	1005,50,0,0,Mob1::OnGreenSlime
+002-1.gat,0,0,0,0	monster	GiantMaggot	1006,30,0,0,Mob1::OnGiantMaggot
+002-1.gat,0,0,0,0	monster	RedScorpion	1004,20,0,0,Mob1::OnRedScorpion
 
-new_1-1.gat,0,0,0	script	Mob1	-1,{
+002-1.gat,0,0,0	script	Mob1	-1,{
 OnGreenSlime:
 	set @mobID, 1005;
 	callfunc "MobPoints";
diff --git a/npc/002-1_Sandstorm/nomads.txt b/npc/002-1_Sandstorm/nomads.txt
index 13edea35..0b7e7426 100644
--- a/npc/002-1_Sandstorm/nomads.txt
+++ b/npc/002-1_Sandstorm/nomads.txt
@@ -1,4 +1,6 @@
-new_1-1.gat,15,67,0	script	Samuel	132,{
+//
+
+002-1.gat,15,67,0	script	Samuel	132,{
 	mes "[Samuel the Nomad]";
 	mes "\"This is really a nice place.\"";
 	
@@ -6,7 +8,7 @@ new_1-1.gat,15,67,0	script	Samuel	132,{
 	close;
 }
 
-new_1-1.gat,18,68,0	script	Elijah	128,{
+002-1.gat,18,68,0	script	Elijah	128,{
 	mes "[Elijah the Nomad]";
 	mes "\"If I only had a tent...\"";
 	
diff --git a/npc/002-1_Sandstorm/rogue.txt b/npc/002-1_Sandstorm/rogue.txt
index 87ec45fa..7169e446 100644
--- a/npc/002-1_Sandstorm/rogue.txt
+++ b/npc/002-1_Sandstorm/rogue.txt
@@ -1,4 +1,6 @@
-new_1-1.gat,22,21,0	script	Malivox	103,{
+//
+
+002-1.gat,22,21,0	script	Malivox	103,{
 
 //	if (ResetA_charstate == 1) goto L_Multiple;
 
diff --git a/npc/002-3_Desert_mines/_import.txt b/npc/002-3_Desert_mines/_import.txt
index fdbfc449..8cb14224 100644
--- a/npc/002-3_Desert_mines/_import.txt
+++ b/npc/002-3_Desert_mines/_import.txt
@@ -1,4 +1,5 @@
 map: 002-3.gat
+npc: npc/002-3_Desert_mines/monsters.txt
 npc: npc/002-3_Desert_mines/miners.txt
 npc: npc/002-3_Desert_mines/_warps.txt
 npc: npc/002-3_Desert_mines/_mobs.txt
diff --git a/npc/002-3_Desert_mines/miners.txt b/npc/002-3_Desert_mines/miners.txt
index 1bbb1637..2ee99b26 100644
--- a/npc/002-3_Desert_mines/miners.txt
+++ b/npc/002-3_Desert_mines/miners.txt
@@ -1,6 +1,6 @@
 //
 
-new_2-1.gat,35,35,6	script	Nathan	109,{
+002-3.gat,35,35,6	script	Nathan	109,{
 	mes "[Nathan the Miner]";
 	mes "\"It's very dangerous in here.";
         mes "We had a big earthquake here";
@@ -9,31 +9,9 @@ new_2-1.gat,35,35,6	script	Nathan	109,{
 	close;
 }
 
-new_5-1.gat,32,94,6	script	Naem	109,{
-	mes "[Naem the Miner]";
-	mes "\"Do you want me to lift you to the upper level?\"";
-	next;
-	menu
-		"Sure", L_Sure,
-		"Not yet!", -;
-	close;
-
-L_Sure:
-	warp "new_2-1.gat", 87, 99;
-	close;
-}
-
-new_2-1.gat,85,97,6	script	Naem	109,{
+002-3-1.gat,85,97,6	script	Naem	109,{
 	mes "[Naem the Miner]";
 	mes "\"We discovered an underground palace.";
-	mes "Do you want me to let you in?\"";
-	next;
-	menu
-		"Sure", L_Sure,
-		"Not yet!", -;
-	close;
-
-L_Sure:
-	warp "new_5-1.gat", 34, 92;
+	mes "You can get there using the passage ont he left.\"";
 	close;
 }
diff --git a/npc/002-4_Desert_mines/_import.txt b/npc/002-4_Desert_mines/_import.txt
index e22b6c19..5d87397b 100644
--- a/npc/002-4_Desert_mines/_import.txt
+++ b/npc/002-4_Desert_mines/_import.txt
@@ -1,4 +1,5 @@
 map: 002-4.gat
+npc: npc/002-4_Desert_mines/miners.txt
 npc: npc/002-4_Desert_mines/monsters.txt
 npc: npc/002-4_Desert_mines/chest.txt
 npc: npc/002-4_Desert_mines/_warps.txt
diff --git a/npc/002-4_Desert_mines/monsters.txt b/npc/002-4_Desert_mines/monsters.txt
index 0b8f967b..34acaa9f 100644
--- a/npc/002-4_Desert_mines/monsters.txt
+++ b/npc/002-4_Desert_mines/monsters.txt
@@ -2,10 +2,10 @@
 // This is the Desert Mines south of Tulimshar -- level 2.
 //
 
-new_5-1.gat,0,0,0,0	monster	Spider		1012,10,2500,0,Mob5::OnSpider
-new_5-1.gat,0,0,0,0	monster	YellowSlime	1007,25,2500,0,Mob5::OnYellowSlime
+002-4.gat,0,0,0,0	monster	Spider		1012,10,2500,0,Mob5::OnSpider
+002-4.gat,0,0,0,0	monster	YellowSlime	1007,25,2500,0,Mob5::OnYellowSlime
 
-new_5-1.gat,0,0,0	script	Mob5	-1,{
+002-4.gat,0,0,0	script	Mob5	-1,{
 OnSpider:
 	set @mobID, 1012;
 	callfunc "MobPoints";
diff --git a/npc/003-1_Beach/monsters.txt b/npc/003-1_Beach/monsters.txt
index 81246489..8407a835 100644
--- a/npc/003-1_Beach/monsters.txt
+++ b/npc/003-1_Beach/monsters.txt
@@ -2,10 +2,10 @@
 // This is the Desert Beach.
 //
 
-new_15-1.gat,0,0,0,0	monster	BlackScorpion	1009,20,0,0,Mob15::OnBlackScorpion
-new_15-1.gat,0,0,0,0	monster	Snake		1010,10,0,0,Mob15::OnSnake
+003-1.gat,0,0,0,0	monster	BlackScorpion	1009,20,0,0,Mob15::OnBlackScorpion
+003-1.gat,0,0,0,0	monster	Snake		1010,10,0,0,Mob15::OnSnake
 
-new_15-1.gat,0,0,0	script	Mob15	-1,{
+003-1.gat,0,0,0	script	Mob15	-1,{
 OnBlackScorpion:
 	set @mobID, 1009;
 	callfunc "MobPoints";
diff --git a/npc/004-1_Beach/monsters.txt b/npc/004-1_Beach/monsters.txt
index 89fcbda7..b842621e 100644
--- a/npc/004-1_Beach/monsters.txt
+++ b/npc/004-1_Beach/monsters.txt
@@ -2,11 +2,11 @@
 // This is the Beach west of Tulimshar.
 //
 
-new_34-1.gat,0,0,0,0     monster SeaSlime        1033,30,0,0,Mob34::OnSeaSlime
-new_34-1.gat,0,0,0,0     monster GiantMaggot     1006,10,0,0,Mob34::OnGiantMaggot
-new_34-1.gat,0,0,0,0     monster RedScorpion     1004,12,0,0,Mob34::OnRedScorpion
+004-1.gat,0,0,0,0     monster SeaSlime        1033,30,0,0,Mob34::OnSeaSlime
+004-1.gat,0,0,0,0     monster GiantMaggot     1006,10,0,0,Mob34::OnGiantMaggot
+004-1.gat,0,0,0,0     monster RedScorpion     1004,12,0,0,Mob34::OnRedScorpion
 
-new_34-1.gat,0,0,0	script	Mob34	-1,{
+004-1.gat,0,0,0	script	Mob34	-1,{
 OnSeaSlime:
 	set @mobID, 1033;
 	callfunc "MobPoints";