Rebuild maps

7 files changed, 10 insertions, 33 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index f771c7502..7ca0ec8c3 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -42,7 +42,6 @@ map_list: (
     "009-1",
     "010-1-1",
     "010-1",
-    "010-2-1",
     "010-2",
     "011-1",
     "011-2",
diff --git a/db/map_index.txt b/db/map_index.txt
index 4ab5999db..5a53e2709 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -39,14 +39,13 @@
 009-1 39
 010-1-1 40
 010-1 41
-010-2-1 42
-010-2 43
-011-1 44
-011-2 45
-boss 46
-botcheck 47
-sec_pri 48
-soren-2 49
-soren 50
-test 51
-testbg 52
+010-2 42
+011-1 43
+011-2 44
+boss 45
+botcheck 46
+sec_pri 47
+soren-2 48
+soren 49
+test 50
+testbg 51
diff --git a/maps/re/010-2-1.mcache b/maps/re/010-2-1.mcache
deleted file mode 100644
index cc2611d94..000000000
--- a/maps/re/010-2-1.mcache
+++ /dev/null
diff --git a/npc/010-2-1/_import.txt b/npc/010-2-1/_import.txt
deleted file mode 100644
index bfe5d5e8c..000000000
--- a/npc/010-2-1/_import.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-// Map 010-2-1: Canyon Caves
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/010-2-1/_mobs.txt",
-"npc/010-2-1/_warps.txt",
diff --git a/npc/010-2-1/_mobs.txt b/npc/010-2-1/_mobs.txt
deleted file mode 100644
index 7c5134f47..000000000
--- a/npc/010-2-1/_mobs.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 010-2-1: Canyon Caves mobs
-010-2-1,55,58,29,22	monster	Cave Snake	1035,12,35000,150000
-010-2-1,70,40,3,1	monster	Small Topaz Bif	1101,1,35000,150000
-010-2-1,54,54,54,54	monster	Cave Maggot	1027,20,40000,200000
-010-2-1,43,66,9,6	monster	Snake	1122,3,35000,150000
-010-2-1,46,40,4,4	monster	Snake	1122,3,35000,150000
-010-2-1,84,56,9,9	monster	Snake	1122,3,35000,150000
-010-2-1,60,46,29,22	monster	Cave Maggot	1027,6,35000,150000
-010-2-1,55,48,29,22	monster	Small Topaz Bif	1101,3,35000,150000
diff --git a/npc/010-2-1/_warps.txt b/npc/010-2-1/_warps.txt
deleted file mode 100644
index 052a836e2..000000000
--- a/npc/010-2-1/_warps.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 010-2-1: Canyon Caves warps
-010-2-1,78,73,0	warp	#010-2-1_78_73	0,0,004-2,100,90
-010-2-1,26,86,0	warp	#010-2-1_26_86	0,0,004-2,84,78
-010-2-1,25,47,0	warp	#010-2-1_25_47	0,0,010-1,93,67
-010-2-1,51,26,0	warp	#010-2-1_51_26	0,0,004-2,116,35
diff --git a/npc/_import.txt b/npc/_import.txt
index f2b6d1773..683dcae10 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -41,7 +41,6 @@
 @include "npc/009-1/_import.txt"
 @include "npc/010-1-1/_import.txt"
 @include "npc/010-1/_import.txt"
-@include "npc/010-2-1/_import.txt"
 @include "npc/010-2/_import.txt"
 @include "npc/011-1/_import.txt"
 @include "npc/011-2/_import.txt"