Fix some NPC (etc) map names

19 files changed, 47 insertions, 25 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;