30 files changed, 33 insertions, 74 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index bdeb60916..55916fded 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -26,6 +26,7 @@ map_list: (
     "003-7",
     "003-8",
     "004-1",
+    "004-2-1",
     "004-2",
     "005-1",
     "005-2",
@@ -35,22 +36,6 @@ map_list: (
     "005-6",
     "005-7",
     "007-1",
-    "008-1",
-    "008-2-0",
-    "008-2-1",
-    "008-2-10",
-    "008-2-11",
-    "008-2-12",
-    "008-2-13",
-    "008-2-14",
-    "008-2-2",
-    "008-2-3",
-    "008-2-4",
-    "008-2-5",
-    "008-2-6",
-    "008-2-7",
-    "008-2-8",
-    "008-2-9",
     "009-1",
     "009-2",
     "009-5",
diff --git a/db/map_index.txt b/db/map_index.txt
index a7e420f78..25ac0fe74 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -23,39 +23,24 @@
 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
-009-1 51
-009-2 52
-009-5 53
-010-1 54
-boss 55
-botcheck 56
-sec_pri 57
-soren-2 58
-soren 59
-test 60
-testbg 61
+004-2-1 26
+004-2 27
+005-1 28
+005-2 29
+005-3 30
+005-4 31
+005-5 32
+005-6 33
+005-7 34
+007-1 35
+009-1 36
+009-2 37
+009-5 38
+010-1 39
+boss 40
+botcheck 41
+sec_pri 42
+soren-2 43
+soren 44
+test 45
+testbg 46
diff --git a/maps/re/003-1.mcache b/maps/re/003-1.mcache
index 455ba6476..54190e5d9 100644
--- a/maps/re/003-1.mcache
+++ b/maps/re/003-1.mcache
diff --git a/maps/re/003-10.mcache b/maps/re/003-10.mcache
index 12d44abcf..061ec32c2 100644
--- a/maps/re/003-10.mcache
+++ b/maps/re/003-10.mcache
diff --git a/maps/re/004-1.mcache b/maps/re/004-1.mcache
index 0418696d7..48edf514a 100644
--- a/maps/re/004-1.mcache
+++ b/maps/re/004-1.mcache
diff --git a/maps/re/004-2-1.mcache b/maps/re/004-2-1.mcache
new file mode 100644
index 000000000..08dfe15b1
--- /dev/null
+++ b/maps/re/004-2-1.mcache
diff --git a/maps/re/004-2.mcache b/maps/re/004-2.mcache
index ab5da127c..57d312143 100644
--- a/maps/re/004-2.mcache
+++ b/maps/re/004-2.mcache
diff --git a/maps/re/008-1.mcache b/maps/re/008-1.mcache
deleted file mode 100644
index 6e2bd3ecf..000000000
--- a/maps/re/008-1.mcache
+++ /dev/null
diff --git a/maps/re/008-2-0.mcache b/maps/re/008-2-0.mcache
deleted file mode 100644
index 51e8a0846..000000000
--- a/maps/re/008-2-0.mcache
+++ /dev/null
diff --git a/maps/re/008-2-1.mcache b/maps/re/008-2-1.mcache
deleted file mode 100644
index 5543a3d45..000000000
--- a/maps/re/008-2-1.mcache
+++ /dev/null
diff --git a/maps/re/008-2-10.mcache b/maps/re/008-2-10.mcache
deleted file mode 100644
index 363ae8034..000000000
--- a/maps/re/008-2-10.mcache
+++ /dev/null
diff --git a/maps/re/008-2-11.mcache b/maps/re/008-2-11.mcache
deleted file mode 100644
index 8072bc4b5..000000000
--- a/maps/re/008-2-11.mcache
+++ /dev/null
diff --git a/maps/re/008-2-12.mcache b/maps/re/008-2-12.mcache
deleted file mode 100644
index c9fac740d..000000000
--- a/maps/re/008-2-12.mcache
+++ /dev/null
diff --git a/maps/re/008-2-13.mcache b/maps/re/008-2-13.mcache
deleted file mode 100644
index b07044b2d..000000000
--- a/maps/re/008-2-13.mcache
+++ /dev/null
diff --git a/maps/re/008-2-14.mcache b/maps/re/008-2-14.mcache
deleted file mode 100644
index 15d75da6a..000000000
--- a/maps/re/008-2-14.mcache
+++ /dev/null
diff --git a/maps/re/008-2-2.mcache b/maps/re/008-2-2.mcache
deleted file mode 100644
index 9bdc0fcb4..000000000
--- a/maps/re/008-2-2.mcache
+++ /dev/null
diff --git a/maps/re/008-2-3.mcache b/maps/re/008-2-3.mcache
deleted file mode 100644
index 12b2e69df..000000000
--- a/maps/re/008-2-3.mcache
+++ /dev/null
diff --git a/maps/re/008-2-4.mcache b/maps/re/008-2-4.mcache
deleted file mode 100644
index 47c7ea73d..000000000
--- a/maps/re/008-2-4.mcache
+++ /dev/null
diff --git a/maps/re/008-2-5.mcache b/maps/re/008-2-5.mcache
deleted file mode 100644
index b304a4173..000000000
--- a/maps/re/008-2-5.mcache
+++ /dev/null
diff --git a/maps/re/008-2-6.mcache b/maps/re/008-2-6.mcache
deleted file mode 100644
index ca05dd43d..000000000
--- a/maps/re/008-2-6.mcache
+++ /dev/null
diff --git a/maps/re/008-2-7.mcache b/maps/re/008-2-7.mcache
deleted file mode 100644
index 64611ee90..000000000
--- a/maps/re/008-2-7.mcache
+++ /dev/null
diff --git a/maps/re/008-2-8.mcache b/maps/re/008-2-8.mcache
deleted file mode 100644
index 14dabe85b..000000000
--- a/maps/re/008-2-8.mcache
+++ /dev/null
diff --git a/maps/re/008-2-9.mcache b/maps/re/008-2-9.mcache
deleted file mode 100644
index e92ecc662..000000000
--- a/maps/re/008-2-9.mcache
+++ /dev/null
diff --git a/npc/003-1/_warps.txt b/npc/003-1/_warps.txt
index 35a39efef..07b38bbfc 100644
--- a/npc/003-1/_warps.txt
+++ b/npc/003-1/_warps.txt
@@ -12,9 +12,9 @@
 003-1,112,146,0	warp	#003-1_112_146	0,0,003-6,40,38
 003-1,111,136,0	warp	#003-1_111_136	0,0,003-7,39,40
 003-1,107,132,0	warp	#003-1_107_132	0,0,003-7,29,31
-003-1,112,100,0	warp	#003-1_112_100	0,0,003-8,31,43
+003-1,110,100,0	warp	#003-1_110_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,115,88,0	warp	#003-1_115_88	0,0,003-8,41,28
 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
 003-1,58,54,0	warp	#003-1_58_54	0,0,003-1-3,82,82
diff --git a/npc/003-8/_warps.txt b/npc/003-8/_warps.txt
index 595a65d6b..7df19cbc7 100644
--- a/npc/003-8/_warps.txt
+++ b/npc/003-8/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 003-8: Terranite Forge warps
-003-8,31,44,0	warp	#003-8_31_44	0,0,003-1,112,101
-003-8,41,27,0	warp	#003-8_41_27	0,0,003-1,115,94
+003-8,31,44,0	warp	#003-8_31_44	0,0,003-1,110,101
+003-8,41,27,0	warp	#003-8_41_27	0,0,003-1,115,89
diff --git a/npc/004-1/_warps.txt b/npc/004-1/_warps.txt
index 936dd3589..1c64ab80e 100644
--- a/npc/004-1/_warps.txt
+++ b/npc/004-1/_warps.txt
@@ -3,3 +3,4 @@
 004-1,63,56,0	warp	#004-1_63_56	4,0,003-1,60,156
 004-1,92,114,0	warp	#004-1_92_114	0,0,007-1,85,51
 004-1,33,109,0	warp	#004-1_33_109	0,0,007-1,51,36
+004-1,120,95,0	warp	#004-1_120_95	0,2,004-2,21,48
diff --git a/npc/004-2-1/_import.txt b/npc/004-2-1/_import.txt
new file mode 100644
index 000000000..5ec83f1d9
--- /dev/null
+++ b/npc/004-2-1/_import.txt
@@ -0,0 +1,2 @@
+// Map 004-2-1: Desert cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
diff --git a/npc/004-2/_mobs.txt b/npc/004-2/_mobs.txt
index ed9825ccd..cf8f1493d 100644
--- a/npc/004-2/_mobs.txt
+++ b/npc/004-2/_mobs.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 004-2: Desert Mountains mobs
-004-2,36,20,3,3	monster	Fallen Guard	1082,2,35000,150000
+004-2,56,20,3,3	monster	Fallen Guard	1082,2,35000,150000
diff --git a/npc/004-2/_warps.txt b/npc/004-2/_warps.txt
index b52d7ca76..9e1b2b99d 100644
--- a/npc/004-2/_warps.txt
+++ b/npc/004-2/_warps.txt
@@ -1,3 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 004-2: Desert Mountains warps
-004-2,19,47,0	warp	#004-2_19_47	0,0,004-1,119,94
+004-2,20,48,0	warp	#004-2_20_48	0,2,004-1,119,95
+004-2,84,77,0	warp	#004-2_84_77	0,0,004-2-1,119,95
diff --git a/npc/_import.txt b/npc/_import.txt
index 76e248ae0..8556a07a8 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -25,6 +25,7 @@
 @include "npc/003-7/_import.txt"
 @include "npc/003-8/_import.txt"
 @include "npc/004-1/_import.txt"
+@include "npc/004-2-1/_import.txt"
 @include "npc/004-2/_import.txt"
 @include "npc/005-1/_import.txt"
 @include "npc/005-2/_import.txt"
@@ -34,22 +35,6 @@
 @include "npc/005-6/_import.txt"
 @include "npc/005-7/_import.txt"
 @include "npc/007-1/_import.txt"
-@include "npc/008-1/_import.txt"
-@include "npc/008-2-0/_import.txt"
-@include "npc/008-2-1/_import.txt"
-@include "npc/008-2-10/_import.txt"
-@include "npc/008-2-11/_import.txt"
-@include "npc/008-2-12/_import.txt"
-@include "npc/008-2-13/_import.txt"
-@include "npc/008-2-14/_import.txt"
-@include "npc/008-2-2/_import.txt"
-@include "npc/008-2-3/_import.txt"
-@include "npc/008-2-4/_import.txt"
-@include "npc/008-2-5/_import.txt"
-@include "npc/008-2-6/_import.txt"
-@include "npc/008-2-7/_import.txt"
-@include "npc/008-2-8/_import.txt"
-@include "npc/008-2-9/_import.txt"
 @include "npc/009-1/_import.txt"
 @include "npc/009-2/_import.txt"
 @include "npc/009-5/_import.txt"