Move map 012 to 001-4 for consistency

7 files changed, 55 insertions, 55 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index f7c0e802f..7552c47bb 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -6,6 +6,7 @@ map_list: (
     "000-1",
     "001-1",
     "001-2",
+    "001-4",
     "002-1",
     "002-2",
     "002-3",
@@ -50,7 +51,6 @@ map_list: (
     "008-2-7",
     "008-2-8",
     "008-2-9",
-    "012",
     "botcheck",
     "sec_pri",
     "test",
diff --git a/db/map_index.txt b/db/map_index.txt
index 6d9c3a35f..017096230 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -3,51 +3,51 @@
 000-1 3
 001-1 4
 001-2 5
-002-1 6
-002-2 7
-002-3 8
-002-4 9
-003-1-2 10
-003-1-3 11
-003-1 12
-003-13 13
-003-2-0 14
-003-2-1 15
-003-2-2 16
-003-2 17
-003-3 18
-003-4 19
-003-5 20
-003-6 21
-003-7 22
-003-8 23
-004-1 24
-004-2 25
-005-1 26
-005-2 27
-005-3 28
-005-4 29
-005-5 30
-005-6 31
-005-7 32
-007-1 33
-008-1 34
-008-2-0 35
-008-2-1 36
-008-2-10 37
-008-2-11 38
-008-2-12 39
-008-2-13 40
-008-2-14 41
-008-2-2 42
-008-2-3 43
-008-2-4 44
-008-2-5 45
-008-2-6 46
-008-2-7 47
-008-2-8 48
-008-2-9 49
-012 50
+001-4 6
+002-1 7
+002-2 8
+002-3 9
+002-4 10
+003-1-2 11
+003-1-3 12
+003-1 13
+003-13 14
+003-2-0 15
+003-2-1 16
+003-2-2 17
+003-2 18
+003-3 19
+003-4 20
+003-5 21
+003-6 22
+003-7 23
+003-8 24
+004-1 25
+004-2 26
+005-1 27
+005-2 28
+005-3 29
+005-4 30
+005-5 31
+005-6 32
+005-7 33
+007-1 34
+008-1 35
+008-2-0 36
+008-2-1 37
+008-2-10 38
+008-2-11 39
+008-2-12 40
+008-2-13 41
+008-2-14 42
+008-2-2 43
+008-2-3 44
+008-2-4 45
+008-2-5 46
+008-2-6 47
+008-2-7 48
+008-2-8 49
+008-2-9 50
 botcheck 51
 sec_pri 52
 test 53
diff --git a/maps/re/012.mcache b/maps/re/001-4.mcache
index 1581c1877..1581c1877 100644
--- a/maps/re/012.mcache
+++ b/maps/re/001-4.mcache
diff --git a/npc/012/_import.txt b/npc/001-4/_import.txt
index 288da5ebf..3cb4d9699 100644
--- a/npc/012/_import.txt
+++ b/npc/001-4/_import.txt
@@ -1,3 +1,3 @@
-// Map 012: Enchanted Forest
+// Map 001-4: Enchanted Forest
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/012/_mobs.txt",
+"npc/001-4/_mobs.txt",
diff --git a/npc/001-4/_mobs.txt b/npc/001-4/_mobs.txt
new file mode 100644
index 000000000..aebb74508
--- /dev/null
+++ b/npc/001-4/_mobs.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 001-4: Enchanted Forest mobs
+001-4,72,232,23,23	monster	Clover Field	1028,1,60000,120000
+001-4,224,238,23,23	monster	Clover Field	1028,1,60000,120000
+001-4,226,77,23,23	monster	Clover Field	1028,1,60000,120000
+001-4,74,77,23,23	monster	Clover Field	1028,1,60000,120000
diff --git a/npc/012/_mobs.txt b/npc/012/_mobs.txt
deleted file mode 100644
index 453f3bc78..000000000
--- a/npc/012/_mobs.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 012: Enchanted Forest mobs
-012,72,232,23,23	monster	Clover Field	1028,1,60000,120000
-012,224,238,23,23	monster	Clover Field	1028,1,60000,120000
-012,226,77,23,23	monster	Clover Field	1028,1,60000,120000
-012,74,77,23,23	monster	Clover Field	1028,1,60000,120000
diff --git a/npc/_import.txt b/npc/_import.txt
index f945032de..56495f66a 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -5,6 +5,7 @@
 @include "npc/000-1/_import.txt"
 @include "npc/001-1/_import.txt"
 @include "npc/001-2/_import.txt"
+@include "npc/001-4/_import.txt"
 @include "npc/002-1/_import.txt"
 @include "npc/002-2/_import.txt"
 @include "npc/002-3/_import.txt"
@@ -49,7 +50,6 @@
 @include "npc/008-2-7/_import.txt"
 @include "npc/008-2-8/_import.txt"
 @include "npc/008-2-9/_import.txt"
-@include "npc/012/_import.txt"
 @include "npc/botcheck/_import.txt"
 @include "npc/sec_pri/_import.txt"
 @include "npc/test/_import.txt"