Map name/warp/monster location fixes

23 files changed, 66 insertions, 66 deletions

diff --git a/npc/halloween/2006/halloween1.txt b/npc/halloween/2006/halloween1.txt
index 8af51b63..6be68cd3 100644
--- a/npc/halloween/2006/halloween1.txt
+++ b/npc/halloween/2006/halloween1.txt
@@ -1,4 +1,4 @@
-new_9-1.gat,119,78,0 script Halloween1 103,{
+011-1.gat,119,78,0 script Halloween1 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween10.txt b/npc/halloween/2006/halloween10.txt
index 702c320e..265f0371 100644
--- a/npc/halloween/2006/halloween10.txt
+++ b/npc/halloween/2006/halloween10.txt
@@ -1,4 +1,4 @@
-new_5-1.gat,88,99,0 script Halloween10 103,{
+002-4.gat,88,99,0 script Halloween10 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween11.txt b/npc/halloween/2006/halloween11.txt
index 4d7804c5..a0dbd464 100644
--- a/npc/halloween/2006/halloween11.txt
+++ b/npc/halloween/2006/halloween11.txt
@@ -1,4 +1,4 @@
-new_6-1.gat,71,70,0 script Halloween11 103,{
+001-3.gat,71,70,0 script Halloween11 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween12.txt b/npc/halloween/2006/halloween12.txt
index 9ca3db5c..2b4be211 100644
--- a/npc/halloween/2006/halloween12.txt
+++ b/npc/halloween/2006/halloween12.txt
@@ -1,4 +1,4 @@
-new_7-1.gat,121,69,0 script Halloween12 103,{
+005-1.gat,121,69,0 script Halloween12 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween13.txt b/npc/halloween/2006/halloween13.txt
index 7b9e46fa..a57108be 100644
--- a/npc/halloween/2006/halloween13.txt
+++ b/npc/halloween/2006/halloween13.txt
@@ -1,4 +1,4 @@
-new_8-1.gat,38,65,0 script Halloween13 103,{
+001-2.gat,38,65,0 script Halloween13 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween14.txt b/npc/halloween/2006/halloween14.txt
index 16a6a3fa..591d2b25 100644
--- a/npc/halloween/2006/halloween14.txt
+++ b/npc/halloween/2006/halloween14.txt
@@ -1,4 +1,4 @@
-new_10-1.gat,56,61,0 script Halloween14 103,{
+019-1.gat,56,61,0 script Halloween14 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween15.txt b/npc/halloween/2006/halloween15.txt
index 04987efb..02c7f53e 100644
--- a/npc/halloween/2006/halloween15.txt
+++ b/npc/halloween/2006/halloween15.txt
@@ -1,4 +1,4 @@
-new_11-1.gat,51,49,0 script Halloween15 103,{
+020-1.gat,51,49,0 script Halloween15 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween16.txt b/npc/halloween/2006/halloween16.txt
index dfc6ea46..a668787b 100644
--- a/npc/halloween/2006/halloween16.txt
+++ b/npc/halloween/2006/halloween16.txt
@@ -1,4 +1,4 @@
-new_12-1.gat,35,44,0 script Halloween16 103,{
+020-3.gat,35,44,0 script Halloween16 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween17.txt b/npc/halloween/2006/halloween17.txt
index c815854b..83fe2e50 100644
--- a/npc/halloween/2006/halloween17.txt
+++ b/npc/halloween/2006/halloween17.txt
@@ -1,4 +1,4 @@
-new_13-1.gat,74,27,0 script Halloween17 103,{
+020-2.gat,74,27,0 script Halloween17 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween18.txt b/npc/halloween/2006/halloween18.txt
index 117dc247..70c1cbbd 100644
--- a/npc/halloween/2006/halloween18.txt
+++ b/npc/halloween/2006/halloween18.txt
@@ -1,4 +1,4 @@
-new_15-1.gat,130,9,0 script Halloween18 103,{
+003-1.gat,130,9,0 script Halloween18 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween19.txt b/npc/halloween/2006/halloween19.txt
index f5cd2c50..c1c7536a 100644
--- a/npc/halloween/2006/halloween19.txt
+++ b/npc/halloween/2006/halloween19.txt
@@ -1,4 +1,4 @@
-new_16-1.gat,113,71,0 script Halloween19 103,{
+007-1.gat,113,71,0 script Halloween19 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween2.txt b/npc/halloween/2006/halloween2.txt
index c2bed367..fdc441c6 100644
--- a/npc/halloween/2006/halloween2.txt
+++ b/npc/halloween/2006/halloween2.txt
@@ -1,4 +1,4 @@
-new_9-1.gat,48,58,0 script Halloween2 103,{
+011-1.gat,48,58,0 script Halloween2 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween20.txt b/npc/halloween/2006/halloween20.txt
index e4ec7b71..ed7e69a5 100644
--- a/npc/halloween/2006/halloween20.txt
+++ b/npc/halloween/2006/halloween20.txt
@@ -1,4 +1,4 @@
-new_3-1.gat,143,20,0 script Halloween20 103,{
+001-1.gat,143,20,0 script Halloween20 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween3.txt b/npc/halloween/2006/halloween3.txt
index b19562fa..5ff36592 100644
--- a/npc/halloween/2006/halloween3.txt
+++ b/npc/halloween/2006/halloween3.txt
@@ -1,4 +1,4 @@
-new_9-1.gat,45,85,0 script Halloween3 103,{
+011-1.gat,45,85,0 script Halloween3 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween4.txt b/npc/halloween/2006/halloween4.txt
index 738aff0e..ac245dca 100644
--- a/npc/halloween/2006/halloween4.txt
+++ b/npc/halloween/2006/halloween4.txt
@@ -1,4 +1,4 @@
-new_17-1.gat,11,57,0 script Halloween4 103,{
+011-4.gat,11,57,0 script Halloween4 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween5.txt b/npc/halloween/2006/halloween5.txt
index df64d075..98f9abb7 100644
--- a/npc/halloween/2006/halloween5.txt
+++ b/npc/halloween/2006/halloween5.txt
@@ -1,4 +1,4 @@
-new_4-1.gat,17,30,0 script Halloween5 103,{
+011-3.gat,17,30,0 script Halloween5 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween6.txt b/npc/halloween/2006/halloween6.txt
index 964feb34..4f3dedd6 100644
--- a/npc/halloween/2006/halloween6.txt
+++ b/npc/halloween/2006/halloween6.txt
@@ -1,4 +1,4 @@
-new_14-1.gat,28,48,0 script Halloween6 103,{
+010-2.gat,28,48,0 script Halloween6 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween7.txt b/npc/halloween/2006/halloween7.txt
index f33a1aee..613aa8af 100644
--- a/npc/halloween/2006/halloween7.txt
+++ b/npc/halloween/2006/halloween7.txt
@@ -1,4 +1,4 @@
-new_1-1.gat,103,102,0 script Halloween7 103,{
+002-2.gat,103,102,0 script Halloween7 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween8.txt b/npc/halloween/2006/halloween8.txt
index 679de9ee..e0acab51 100644
--- a/npc/halloween/2006/halloween8.txt
+++ b/npc/halloween/2006/halloween8.txt
@@ -1,4 +1,4 @@
-new_2-1.gat,43,67,0 script Halloween8 103,{
+002-3.gat,43,67,0 script Halloween8 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/halloween9.txt b/npc/halloween/2006/halloween9.txt
index 8e575bd7..ecf97801 100644
--- a/npc/halloween/2006/halloween9.txt
+++ b/npc/halloween/2006/halloween9.txt
@@ -1,4 +1,4 @@
-new_3-1.gat,121,33,0 script Halloween9 103,{
+001-1.gat,121,33,0 script Halloween9 103,{
         mes "[Halloweenist]";
         mes "It's Halloween.";
         mes "The time for tricks and treats.";
diff --git a/npc/halloween/2006/monsters.txt b/npc/halloween/2006/monsters.txt
index 1933b383..e64799f4 100644
--- a/npc/halloween/2006/monsters.txt
+++ b/npc/halloween/2006/monsters.txt
@@ -1,9 +1,9 @@
-new_1-1.gat,0,0,0,0     monster Jack      1022,20,0,0,0
-new_3-1.gat,0,0,0,0     monster Fire_Skull      1023,20,0,0,0
-new_7-1.gat,0,0,0,0     monster Poison_Skull      1024,20,0,0,0
-new_9-1.gat,0,0,0,0     monster Jack      1022,20,0,0,0
-new_10-1.gat,0,0,0,0     monster Fire_Skull      1023,20,0,0,0
-new_11-1.gat,0,0,0,0     monster Poison_Skull      1024,20,0,0,0
-new_14-1.gat,0,0,0,0     monster Jack      1022,20,0,0,0
-new_15-1.gat,0,0,0,0     monster Fire_Skull      1023,20,0,0,0
-new_16-1.gat,0,0,0,0     monster Poison_Skull      1024,20,0,0,0
+002-2.gat,0,0,0,0     monster Jack      1022,20,0,0,0
+001-1.gat,0,0,0,0     monster Fire_Skull      1023,20,0,0,0
+005-1.gat,0,0,0,0     monster Poison_Skull      1024,20,0,0,0
+011-1.gat,0,0,0,0     monster Jack      1022,20,0,0,0
+019-1.gat,0,0,0,0     monster Fire_Skull      1023,20,0,0,0
+020-1.gat,0,0,0,0     monster Poison_Skull      1024,20,0,0,0
+010-2.gat,0,0,0,0     monster Jack      1022,20,0,0,0
+003-1.gat,0,0,0,0     monster Fire_Skull      1023,20,0,0,0
+007-1.gat,0,0,0,0     monster Poison_Skull      1024,20,0,0,0
diff --git a/npc/halloween/2008/monsters.txt b/npc/halloween/2008/monsters.txt
index 6237b02e..a0f32222 100644
--- a/npc/halloween/2008/monsters.txt
+++ b/npc/halloween/2008/monsters.txt
@@ -1,136 +1,136 @@
 //
 
-new_4-1.gat,0,0,0,0	monster	JackO	1022,1,3600000,1800000,Mob4H
+011-3.gat,0,0,0,0	monster	JackO	1022,1,3600000,1800000,Mob4H
 
-new_4-1.gat,0,0,0	script	Mob4H	-1,{
+011-3.gat,0,0,0	script	Mob4H	-1,{
 	set @mobID, 1022;
 	callfunc "MobPoints";
 	break;
 }
 
-new_6-1.gat,0,0,0,0	monster	JackO	1022,5,180000,170000,Mob6H
+001-3.gat,0,0,0,0	monster	JackO	1022,5,180000,170000,Mob6H
 
-new_6-1.gat,0,0,0	script	Mob6H	-1,{
+001-3.gat,0,0,0	script	Mob6H	-1,{
 	set @mobID, 1022;
 	callfunc "MobPoints";
 	break;
 }
 
-new_8-1.gat,132,25,0,0	monster	JackO	1022,1,3600000,1800000,Mob8H
+001-2.gat,132,25,0,0	monster	JackO	1022,1,3600000,1800000,Mob8H
 
-new_8-1.gat,0,0,0	script	Mob8H	-1,{
+001-2.gat,0,0,0	script	Mob8H	-1,{
 	set @mobID, 1022;
 	callfunc "MobPoints";
 	break;
 }
 
-new_13-1.gat,77,64,20,10	monster	JackO	1022,1,3600000,1800000,Mob13H
+020-2.gat,77,64,20,10	monster	JackO	1022,1,3600000,1800000,Mob13H
 
-new_13-1.gat,0,0,0	script	Mob13H	-1,{
+020-2.gat,0,0,0	script	Mob13H	-1,{
 	set @mobID, 1022;
 	callfunc "MobPoints";
 	break;
 }
 
-new_15-1.gat,0,0,0,0	monster	JackO	1022,1,3600000,1800000,Mob15H
+003-1.gat,0,0,0,0	monster	JackO	1022,1,3600000,1800000,Mob15H
 
-new_15-1.gat,0,0,0	script	Mob15H	-1,{
+003-1.gat,0,0,0	script	Mob15H	-1,{
 	set @mobID, 1022;
 	callfunc "MobPoints";
 	break;
 }
 
-new_17-1.gat,76,79,6,1	monster	JackO	1022,1,3600000,1800000,Mob17H
+011-4.gat,76,79,6,1	monster	JackO	1022,1,3600000,1800000,Mob17H
 
-new_17-1.gat,0,0,0	script	Mob17H	-1,{
+011-4.gat,0,0,0	script	Mob17H	-1,{
 	set @mobID, 1022;
 	callfunc "MobPoints";
 	break;
 }
 
-new_20-1.gat,113,47,24,6	monster	JackO	1022,1,3600000,1800000,Mob20H
+009-2.gat,113,47,24,6	monster	JackO	1022,1,3600000,1800000,Mob20H
 
-new_20-1.gat,0,0,0	script	Mob20H	-1,{
+009-2.gat,0,0,0	script	Mob20H	-1,{
 	set @mobID, 1022;
 	callfunc "MobPoints";
 	break;
 }
 
-new_21-1.gat,0,0,0,0	monster	JackO	1022,1,3600000,1800000,Mob21H
+020-4.gat,0,0,0,0	monster	JackO	1022,1,3600000,1800000,Mob21H
 
-new_21-1.gat,0,0,0	script	Mob21H	-1,{
+020-4.gat,0,0,0	script	Mob21H	-1,{
 	set @mobID, 1022;
 	callfunc "MobPoints";
 	break;
 }
 
-new_22-1.gat,86,34,0,0	monster	JackO	1022,2,1800000,900000,Mob22H
+05-3.gat,86,34,0,0	monster	JackO	1022,2,1800000,900000,Mob22H
 
-new_22-1.gat,0,0,0	script	Mob22H	-1,{
+05-3.gat,0,0,0	script	Mob22H	-1,{
 	set @mobID, 1022;
 	callfunc "MobPoints";
 	break;
 }
 
-new_23-1.gat,26,88,0,0	monster	JackO	1022,1,3600000,1800000,Mob23H
+010-2.gat,26,88,0,0	monster	JackO	1022,1,3600000,1800000,Mob23H
 
-new_23-1.gat,0,0,0	script	Mob23H	-1,{
+010-2.gat,0,0,0	script	Mob23H	-1,{
 	set @mobID, 1022;
 	callfunc "MobPoints";
 	break;
 }
 
-new_24-1.gat,115,121,0,0	monster	JackO	1022,1,3600000,1800000,Mob24H
+006-1.gat,115,121,0,0	monster	JackO	1022,1,3600000,1800000,Mob24H
 
-new_24-1.gat,0,0,0	script	Mob24H	-1,{
+006-1.gat,0,0,0	script	Mob24H	-1,{
 	set @mobID, 1022;
 	callfunc "MobPoints";
 	break;
 }
 
-new_25-1.gat,30,125,0,0	monster	JackO	1022,1,3600000,1800000,Mob25H
+006-3.gat,30,125,0,0	monster	JackO	1022,1,3600000,1800000,Mob25H
 
-new_25-1.gat,0,0,0	script	Mob25H	-1,{
+006-3.gat,0,0,0	script	Mob25H	-1,{
 	set @mobID, 1022;
 	callfunc "MobPoints";
 	break;
 }
 
-new_26-1.gat,19,54,0,0	monster	JackO	1022,1,3600000,1800000,Mob26H
+12-1.gat,19,54,0,0	monster	JackO	1022,1,3600000,1800000,Mob26H
 
-new_26-1.gat,0,0,0	script	Mob26H	-1,{
+12-1.gat,0,0,0	script	Mob26H	-1,{
 	set @mobID, 1022;
 	callfunc "MobPoints";
 	break;
 }
 
-new_27-1.gat,54,130,0,0	monster	JackO	1022,1,3600000,1800000,Mob27H
+012-3.gat,54,130,0,0	monster	JackO	1022,1,3600000,1800000,Mob27H
 
-new_27-1.gat,0,0,0	script	Mob27H	-1,{
+012-3.gat,0,0,0	script	Mob27H	-1,{
 	set @mobID, 1022;
 	callfunc "MobPoints";
 	break;
 }
 
-new_34-1.gat,68,20,0,0	monster	JackO	1022,1,3600000,1800000,Mob34H
+004-1.gat,68,20,0,0	monster	JackO	1022,1,3600000,1800000,Mob34H
 
-new_34-1.gat,0,0,0	script	Mob34H	-1,{
+004-1.gat,0,0,0	script	Mob34H	-1,{
 	set @mobID, 1022;
 	callfunc "MobPoints";
 	break;
 }
 
-new_35-1.gat,26,103,0,0	monster	JackO	1022,1,3600000,1800000,Mob35H
+009-3.gat,26,103,0,0	monster	JackO	1022,1,3600000,1800000,Mob35H
 
-new_35-1.gat,0,0,0	script	Mob35H	-1,{
+009-3.gat,0,0,0	script	Mob35H	-1,{
 	set @mobID, 1022;
 	callfunc "MobPoints";
 	break;
 }
 
-new_38-1.gat,121,46,0,0	monster	JackO	1022,1,3600000,1800000,Mob38H
+018-2.gat,121,46,0,0	monster	JackO	1022,1,3600000,1800000,Mob38H
 
-new_38-1.gat,0,0,0	script	Mob38H	-1,{
+018-2.gat,0,0,0	script	Mob38H	-1,{
 	set @mobID, 1022;
 	callfunc "MobPoints";
 	break;
diff --git a/npc/halloween/2008/prize_master.txt b/npc/halloween/2008/prize_master.txt
index 0e621abf..2b0cf642 100644
--- a/npc/halloween/2008/prize_master.txt
+++ b/npc/halloween/2008/prize_master.txt
@@ -1,6 +1,6 @@
 //
 
-new_23-1.gat,43,32,0	script	Prize Master	150,{
+010-2.gat,43,32,0	script	Prize Master	150,{
 	if (Halloween08 == 65535) goto L_Finished;
 
 	if (Halloween08 == 0) callsub S_Explain;
@@ -432,12 +432,12 @@ L_Dev_Spawn_JackO_2:
 	close;
 
 L_Dev_Spawn_JackO_Tulimshar:
-	monster "new_3-1.gat", 44, 70, "Jack O", 1022, 1;
+	monster "001-1.gat", 44, 70, "Jack O", 1022, 1;
 	announce "A ghost in Tulimshar!", 0;
 	close;
 
 L_Dev_Spawn_JackO_Hurnscald:
-	monster "new_19-1.gat", 52, 40, "Jack O", 1022, 1;
+	monster "010-2.gat", 52, 40, "Jack O", 1022, 1;
 	announce "A ghost in Hurnscald!", 0;
 	close;