Map name/warp/monster location fixes

3 files changed, 18 insertions, 18 deletions

diff --git a/npc/013-2_Magic_house/apprentice.txt b/npc/013-2_Magic_house/apprentice.txt
index b27d271d..ce3db4ad 100644
--- a/npc/013-2_Magic_house/apprentice.txt
+++ b/npc/013-2_Magic_house/apprentice.txt
@@ -1,4 +1,4 @@
-new_36-1.gat,25,37,0	script	Fabius	115,{
+013-2.gat,25,37,0	script	Fabius	115,{
     mes "\"Hey! Wanna have a drink or something? High quality, low cost. A poor fella like me needs a bit of extra cash, ye know.\"";
     next;
     menu
diff --git a/npc/013-2_Magic_house/notes.txt b/npc/013-2_Magic_house/notes.txt
index dbcb1209..c30f7c46 100644
--- a/npc/013-2_Magic_house/notes.txt
+++ b/npc/013-2_Magic_house/notes.txt
@@ -1,20 +1,20 @@
-new_36-1.gat,23,32,0	script	Motto	127,{
+013-2.gat,23,32,0	script	Motto	127,{
     mes "Mid pleasures and palaces though we may roam,";
     mes "Be it ever so humble, there's no place like home.";
     close;
 }
 
-new_36-1.gat,30,32,0	script	Note	127,{
+013-2.gat,30,32,0	script	Note	127,{
     mes "Please do not open.";
     close;
 }
 
-new_36-1.gat,38,20,0	script	Saying	127,{
+013-2.gat,38,20,0	script	Saying	127,{
     mes "The early bird catcheth the worm.";
     close;
 }
 
-new_36-1.gat,27,21,0	script	Mirror	127,{
+013-2.gat,27,21,0	script	Mirror	127,{
     mes "You say: \"Mirror mirror on the wall, who has the nicest haircut of them all?\"";
     next;
     mes "\"Oh fair adventurer, your hair indeed looks nice. But wouldn't it look much better, after I have rolled my dice?\"";
@@ -29,59 +29,59 @@ new_36-1.gat,27,21,0	script	Mirror	127,{
 }
 
 // Warp to north-eastern woods
-new_36-1.gat,25,23,0	script	Spell	127,{
+013-2.gat,25,23,0	script	Spell	127,{
     mes "You read: \"I see trees of green, red roses too. I see them bloom for me and you. And I think to myself: \'What a wonderful world\'\"";
     next;
     mes "You think: \"Huh?\"";
     next;
     mes "The spell fulfills its inevitable purpose...";
     next;
-    warp "new_28-1.gat",128,28;
+    warp "013-1.gat",128,28;
     close;
 }
 
 // Warp to Indian in south-eastern desert
-new_36-1.gat,27,24,0	script	Spell	127,{
+013-2.gat,27,24,0	script	Spell	127,{
     mes "You read: \"A red-coloured fellow smoking his pipe - down in the desert - that's what I like!\"";
     next;
     mes "You feel the floor disappear below your feet...";
     next;
-    warp "new_24-1.gat",33,93;
+    warp "006-1.gat",33,93;
     close;
 }
 
 // Warp to snow land
-new_36-1.gat,25,27,0	script	Spell	127,{
+013-2.gat,25,27,0	script	Spell	127,{
     mes "You read: \"Snow-white flakes and eminent frost - I'll go there, whatever the cost!\"";
     next;
     mes "You feel yourself getting lighter...";
     next;
-    warp "new_11-1.gat",84,68;
+    warp "020-1.gat",84,68;
     close;
 }
 
 // Warp to Dimond
-new_36-1.gat,27,27,0	script	Spell	127,{
+013-2.gat,27,27,0	script	Spell	127,{
     mes "You read: \"People and cosiness, lively and fun - that's where I've gone!\"";
     next;
     mes "The world around you slowly dissolves...";
     next;
-    warp "new_23-1.gat",34,42;
+    warp "010-2.gat",34,42;
     close;
 }
 
 // Warp to mines level 2
-new_36-1.gat,26,28,0	script	Spell	127,{
+013-2.gat,26,28,0	script	Spell	127,{
     mes "You read: \"Darkness and legs, eight of them each - I'd rather not go there, but now it's too late...\"";
     next;
     mes "For a moment everything turns black...";
     next;
-    warp "new_5-1.gat",91,41;
+    warp "002-4.gat",91,41;
     close;
 }
 
 // Death
-new_36-1.gat,21,29,0	script	Spell	127,{
+013-2.gat,21,29,0	script	Spell	127,{
     mes "You read: \"Heart stops pumping, breath begone - life is stopping, death has come!\"";
     next;
     mes "You're losing control of your body... everything turns black... while slipping to the floor, you hear a faraway scream... suddenly, you see THE LIGHT!";
@@ -91,7 +91,7 @@ new_36-1.gat,21,29,0	script	Spell	127,{
 }
 
 // Naked
-new_36-1.gat,28,29,0	script	Spell	127,{
+013-2.gat,28,29,0	script	Spell	127,{
     mes "You read: \"Cotton, steel, leather and wool - have I ever seen a greater fool?\"";
     next;
     mes "You suddenly feel naked; you ARE naked!";
diff --git a/npc/013-2_Magic_house/wizard.txt b/npc/013-2_Magic_house/wizard.txt
index ec7deb36..25f30122 100644
--- a/npc/013-2_Magic_house/wizard.txt
+++ b/npc/013-2_Magic_house/wizard.txt
@@ -1,4 +1,4 @@
-new_36-1.gat,66,39,0	script	Old Wizard	116,{
+013-2.gat,66,39,0	script	Old Wizard	116,{
         mes "\"Welcome, dear wanderer! Come into my humble home. Take a rest, eat and drink.\"";
         next;
         menu