make maps

9 files changed, 6 insertions, 10 deletions

diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index 2f7577d6f..82f3fc4a2 100755
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
diff --git a/npc/003-1/_import.txt b/npc/003-1/_import.txt
index 7bc166945..f31b7ec9d 100644
--- a/npc/003-1/_import.txt
+++ b/npc/003-1/_import.txt
@@ -23,6 +23,7 @@
 "npc/003-1/ninathetraveler.txt",
 "npc/003-1/sarah.txt",
 "npc/003-1/ship.txt",
+"npc/003-1/shop.txt",
 "npc/003-1/silvia.txt",
 "npc/003-1/soul-menhir.txt",
 "npc/003-1/swezanne.txt",
@@ -30,4 +31,3 @@
 "npc/003-1/tinris.txt",
 "npc/003-1/wateranimation.txt",
 "npc/003-1/well.txt",
-"npc/003-1/shop.txt",
diff --git a/npc/003-1/_warps.txt b/npc/003-1/_warps.txt
index be0479dc3..5a87130c0 100644
--- a/npc/003-1/_warps.txt
+++ b/npc/003-1/_warps.txt
@@ -15,5 +15,5 @@
 003-1,112,100,0	warp	#003-1_112_100	0,0,003-8,31,43
 003-1,51,65,0	warp	#003-1_51_65	0,0,003-2,42,34
 003-1,115,93,0	warp	#003-1_115_93	0,0,003-8,41,28
-003-1,60,157,0	warp	#003-1_60_157	0,0,004-1,64,57
+003-1,60,157,0	warp	#003-1_60_157	4,0,004-1,63,57
 003-1,116,120,0	warp	#003-1_116_120	0,0,003-1-2,48,35
diff --git a/npc/003-13/_import.txt b/npc/003-13/_import.txt
index 9385569ae..484bc8b54 100644
--- a/npc/003-13/_import.txt
+++ b/npc/003-13/_import.txt
@@ -1,4 +1,4 @@
 // Map 003-13: duel map
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/003-13/arnea.txt",
 "npc/003-13/_warps.txt",
+"npc/003-13/arnea.txt",
diff --git a/npc/003-5/_import.txt b/npc/003-5/_import.txt
index 3cc7e2b9e..f768ea85f 100644
--- a/npc/003-5/_import.txt
+++ b/npc/003-5/_import.txt
@@ -2,4 +2,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/003-5/arnea.txt",
 "npc/003-5/doors.txt",
-"npc/003-5/_warps.txt",
diff --git a/npc/003-5/_warps.txt b/npc/003-5/_warps.txt
deleted file mode 100644
index 1997c1c85..000000000
--- a/npc/003-5/_warps.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 003-5: Tulimshar Jeweler warps
-//003-5,38,41,0	warp	#003-5_38_41	0,0,003-1,96,145
diff --git a/npc/004-1/_mobs.txt b/npc/004-1/_mobs.txt
index 829a9bf66..25e2f14a9 100644
--- a/npc/004-1/_mobs.txt
+++ b/npc/004-1/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 004-1: Tulimshar mobs
-004-1,60,61,0,1	monster	Plushroom Field	1011,1,35000,150000
+004-1,63,62,1,1	monster	Plushroom Field	1011,1,35000,150000
 004-1,84,66,33,48	monster	Maggot	1030,50,35000,450000
 004-1,81,63,2,3	monster	croc	1006,1,35000,150000
diff --git a/npc/004-1/_warps.txt b/npc/004-1/_warps.txt
index 843ff1436..111dfbb86 100644
--- a/npc/004-1/_warps.txt
+++ b/npc/004-1/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 004-1: Tulimshar warps
-004-1,62,57,0	warp	#004-1_62_57	0,0,003-1,59,157
+004-1,63,56,0	warp	#004-1_63_56	4,0,003-1,60,156
diff --git a/npc/005-1/_import.txt b/npc/005-1/_import.txt
index 1ab90c833..194ccd561 100644
--- a/npc/005-1/_import.txt
+++ b/npc/005-1/_import.txt
@@ -10,6 +10,6 @@
 "npc/005-1/ship.txt",
 "npc/005-1/soul-menhir.txt",
 "npc/005-1/trainer.txt",
+"npc/005-1/vincent.txt",
 "npc/005-1/warpcandorbattle.txt",
 "npc/005-1/zegas.txt",
-"npc/005-1/vincent.txt",