make maps

7 files changed, 93 insertions, 53 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 996cc179a..2744cba00 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -2,10 +2,8 @@ map_removed: (
 )
 map_list: (
     "000-0-0",
-    "000-0-1",
     "000-0",
-    "000-2-3",
-    "000-2-4",
+    "000-1",
     "002-1",
     "002-2",
     "002-3",
diff --git a/db/map_index.txt b/db/map_index.txt
index 6c4e3d1e2..00487ebbb 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -1,48 +1,46 @@
 000-0-0 1
-000-0-1 2
-000-0 3
-000-2-3 4
-000-2-4 5
-002-1 6
-002-2 7
-002-3 8
-002-4 9
-003-1-2 10
-003-1 11
-003-13 12
-003-2-0 13
-003-2-1 14
-003-2-2 15
-003-2 16
-003-3 17
-003-4 18
-003-5 19
-003-6 20
-003-7 21
-003-8 22
-004-1 23
-005-1 24
-005-2 25
-005-3 26
-005-4 27
-005-5 28
-005-6 29
-008-1 30
-008-2-0 31
-008-2-1 32
-008-2-10 33
-008-2-11 34
-008-2-12 35
-008-2-13 36
-008-2-14 37
-008-2-2 38
-008-2-3 39
-008-2-4 40
-008-2-5 41
-008-2-6 42
-008-2-7 43
-008-2-8 44
-008-2-9 45
-aeros 46
-test 47
-testbg 48
+000-0 2
+000-1 3
+002-1 4
+002-2 5
+002-3 6
+002-4 7
+003-1-2 8
+003-1 9
+003-13 10
+003-2-0 11
+003-2-1 12
+003-2-2 13
+003-2 14
+003-3 15
+003-4 16
+003-5 17
+003-6 18
+003-7 19
+003-8 20
+004-1 21
+005-1 22
+005-2 23
+005-3 24
+005-4 25
+005-5 26
+005-6 27
+008-1 28
+008-2-0 29
+008-2-1 30
+008-2-10 31
+008-2-11 32
+008-2-12 33
+008-2-13 34
+008-2-14 35
+008-2-2 36
+008-2-3 37
+008-2-4 38
+008-2-5 39
+008-2-6 40
+008-2-7 41
+008-2-8 42
+008-2-9 43
+aeros 44
+test 45
+testbg 46
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index f9d116597..ba364fa26 100755
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
diff --git a/npc/000-1/_import.txt b/npc/000-1/_import.txt
new file mode 100644
index 000000000..da1819af6
--- /dev/null
+++ b/npc/000-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 000-1: Drasil Island
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/000-1/_mobs.txt",
+"npc/000-1/_warps.txt",
diff --git a/npc/000-1/_mobs.txt b/npc/000-1/_mobs.txt
new file mode 100644
index 000000000..9bd9ea81c
--- /dev/null
+++ b/npc/000-1/_mobs.txt
@@ -0,0 +1,39 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 000-1: Drasil Island mobs
+000-1,28,49,6,9	monster	Tortuga	1004,3,16000,120000
+000-1,58,118,34,14	monster	Tortuga	1004,4,35000,300000
+000-1,71,95,4,12	monster	Tortuga	1004,1,35000,300000
+000-1,52,92,4,17	monster	Tortuga	1004,2,35000,300000
+000-1,37,66,11,5	monster	Tortuga	1004,2,35000,120000
+000-1,42,41,9,16	monster	Tortuga	1004,2,35000,120000
+000-1,87,37,12,11	monster	Tortuga	1004,3,35000,120000
+000-1,44,75,2,1	monster	Little Blub	1007,2,25000,120000
+000-1,61,64,7,10	monster	Little Blub	1007,2,25000,120000
+000-1,62,25,10,4	monster	Little Blub	1007,2,25000,120000
+000-1,87,69,4,3	monster	Blub	1008,1,60000,120000
+000-1,85,33,2,3	monster	Little Blub	1007,1,25000,120000
+000-1,85,58,14,9	monster	Little Blub	1007,2,35000,120000
+000-1,48,61,9,6	monster	Little Blub	1007,1,35000,120000
+000-1,28,48,3,5	monster	Little Blub	1007,1,35000,120000
+000-1,35,50,0,1	monster	Plushroom Field	1011,1,35000,150000
+000-1,54,115,0,1	monster	Plushroom Field	1011,1,35000,150000
+000-1,63,80,4,2	monster	Plushroom Field	1011,1,35000,150000
+000-1,54,64,0,2	monster	Plushroom Field	1011,1,35000,150000
+000-1,78,58,4,5	monster	Plushroom Field	1011,2,35000,150000
+000-1,71,62,1,1	monster	Plushroom Field	1011,1,35000,150000
+000-1,32,116,8,9	monster	Croc	1006,2,35000,300000
+000-1,63,31,10,3	monster	Croc	1006,1,35000,300000
+000-1,76,68,1,1	monster	Croc	1006,1,35000,300000
+000-1,52,92,4,17	monster	Croc	1006,1,35000,300000
+000-1,71,77,4,4	monster	Croc	1006,1,35000,300000
+000-1,0,0,0,0	monster	Piou	1002,4,60000,15000
+000-1,78,115,0,0	monster	Crocotree	1010,1,420000,240000
+000-1,57,104,0,0	monster	Crocotree	1010,1,420000,240000
+000-1,39,112,0,0	monster	Crocotree	1010,1,420000,240000
+000-1,67,93,0,0	monster	Crocotree	1010,1,420000,240000
+000-1,53,77,0,0	monster	Crocotree	1010,1,420000,240000
+000-1,64,63,0,0	monster	Crocotree	1010,1,420000,240000
+000-1,31,69,0,0	monster	Crocotree	1010,1,420000,240000
+000-1,44,44,0,0	monster	Crocotree	1010,1,420000,240000
+000-1,70,33,0,0	monster	Crocotree	1010,1,420000,240000
+000-1,84,66,0,0	monster	Crocotree	1010,1,420000,240000
diff --git a/npc/000-1/_warps.txt b/npc/000-1/_warps.txt
new file mode 100644
index 000000000..47b4fb420
--- /dev/null
+++ b/npc/000-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 000-1: Drasil Island warps
+000-1,94,100,0	warp	#000-1_94_100	0,0,000-2-0,21,28
diff --git a/npc/_import.txt b/npc/_import.txt
index cb2fcba29..734c4ca12 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -1,10 +1,8 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 
 @include "npc/000-0-0/_import.txt"
-@include "npc/000-0-1/_import.txt"
 @include "npc/000-0/_import.txt"
-@include "npc/000-2-3/_import.txt"
-@include "npc/000-2-4/_import.txt"
+@include "npc/000-1/_import.txt"
 @include "npc/002-1/_import.txt"
 @include "npc/002-2/_import.txt"
 @include "npc/002-3/_import.txt"