Map name/warp/monster location fixes

2 files changed, 37 insertions, 37 deletions

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;