make map for 010-1 smaller now

7 files changed, 38 insertions, 76 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index dc2f35100..b62174f70 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -41,6 +41,7 @@ map_list: (
     "009-5",
     "010-1-1",
     "010-1",
+    "010-2",
     "boss",
     "botcheck",
     "sec_pri",
diff --git a/db/map_index.txt b/db/map_index.txt
index b5e1071bf..b9aaf0e57 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -38,10 +38,11 @@
 009-5 38
 010-1-1 39
 010-1 40
-boss 41
-botcheck 42
-sec_pri 43
-soren-2 44
-soren 45
-test 46
-testbg 47
+010-2 41
+boss 42
+botcheck 43
+sec_pri 44
+soren-2 45
+soren 46
+test 47
+testbg 48
diff --git a/maps/re/010-1.mcache b/maps/re/010-1.mcache
index 375d51700..7c7a5ac93 100644
--- a/maps/re/010-1.mcache
+++ b/maps/re/010-1.mcache
diff --git a/npc/010-1/_import.txt b/npc/010-1/_import.txt
index 3d09583f9..3248587b8 100644
--- a/npc/010-1/_import.txt
+++ b/npc/010-1/_import.txt
@@ -1,4 +1,3 @@
 // Map 010-1: Desert Mountains
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/010-1/_mobs.txt",
 "npc/010-1/_warps.txt",
diff --git a/npc/010-1/_mobs.txt b/npc/010-1/_mobs.txt
deleted file mode 100644
index d99e735bc..000000000
--- a/npc/010-1/_mobs.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 010-1: Desert Mountains mobs
-010-1,44,218,3,3	monster	Fallen Guard	1082,2,35000,150000
-010-1,152,102,8,2	monster	Snake	1122,2,35000,300000
-010-1,193,77,3,8	monster	Mountain Snake	1123,8,35000,300000
-010-1,128,122,3,2	monster	Desert Bandit	1124,1,35000,300000
-010-1,140,113,3,2	monster	Desert Bandit	1124,1,35000,300000
-010-1,156,110,3,2	monster	Desert Bandit	1124,1,35000,300000
-010-1,171,102,6,5	monster	Desert Bandit	1124,3,35000,300000
-010-1,188,57,6,5	monster	Desert Bandit	1124,3,35000,300000
-010-1,179,95,6,5	monster	Sarracenus	1125,2,35000,300000
diff --git a/npc/010-1/_warps.txt b/npc/010-1/_warps.txt
index 9d1e1e772..0fe61f26b 100644
--- a/npc/010-1/_warps.txt
+++ b/npc/010-1/_warps.txt
@@ -1,59 +1,30 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 010-1: Desert Mountains warps
-010-1,66,103,0	warp	#010-1_66_103	0,0,004-1,33,110
-010-1,69,98,0	warp	#010-1_69_98	0,0,004-1,33,110
-010-1,89,81,0	warp	#010-1_89_81	0,0,004-1,33,110
-010-1,94,75,0	warp	#010-1_94_75	0,0,004-1,33,110
-010-1,92,122,0	warp	#010-1_92_122	0,0,004-1,33,110
-010-1,89,132,0	warp	#010-1_89_132	0,0,004-1,33,110
-010-1,96,135,0	warp	#010-1_96_135	0,0,004-1,33,110
-010-1,87,141,0	warp	#010-1_87_141	0,0,004-1,33,110
-010-1,62,159,0	warp	#010-1_62_159	0,0,004-1,33,110
-010-1,52,155,0	warp	#010-1_52_155	0,0,004-1,33,110
-010-1,47,153,0	warp	#010-1_47_153	0,0,004-1,33,110
-010-1,50,168,0	warp	#010-1_50_168	0,0,004-1,33,110
-010-1,45,175,0	warp	#010-1_45_175	0,0,004-1,33,110
-010-1,59,181,0	warp	#010-1_59_181	0,0,004-1,33,110
-010-1,53,195,0	warp	#010-1_53_195	0,0,004-1,33,110
-010-1,81,193,0	warp	#010-1_81_193	0,0,004-1,33,110
-010-1,78,185,0	warp	#010-1_78_185	0,0,004-1,33,110
-010-1,65,178,0	warp	#010-1_65_178	0,0,004-1,33,110
-010-1,122,194,0	warp	#010-1_122_194	0,0,004-1,33,110
-010-1,110,186,0	warp	#010-1_110_186	0,0,004-1,33,110
-010-1,93,171,0	warp	#010-1_93_171	0,0,004-1,33,110
-010-1,76,171,0	warp	#010-1_76_171	0,0,004-1,33,110
-010-1,68,165,0	warp	#010-1_68_165	0,0,004-1,33,110
-010-1,75,157,0	warp	#010-1_75_157	0,0,004-1,33,110
-010-1,126,165,0	warp	#010-1_126_165	0,0,004-1,33,110
-010-1,88,153,0	warp	#010-1_88_153	0,0,004-1,33,110
-010-1,92,150,0	warp	#010-1_92_150	0,0,004-1,33,110
-010-1,108,143,0	warp	#010-1_108_143	0,0,004-1,33,110
-010-1,124,129,0	warp	#010-1_124_129	0,0,004-1,33,110
-010-1,125,126,0	warp	#010-1_125_126	0,0,004-1,33,110
-010-1,138,129,0	warp	#010-1_138_129	0,0,004-1,33,110
-010-1,118,113,0	warp	#010-1_118_113	0,0,004-1,33,110
-010-1,157,122,0	warp	#010-1_157_122	0,0,004-1,33,110
-010-1,166,115,0	warp	#010-1_166_115	0,0,004-1,33,110
-010-1,163,114,0	warp	#010-1_163_114	0,0,004-1,33,110
-010-1,144,103,0	warp	#010-1_144_103	0,0,004-1,33,110
-010-1,153,99,0	warp	#010-1_153_99	0,0,004-1,33,110
-010-1,188,121,0	warp	#010-1_188_121	0,0,004-1,33,110
-010-1,195,114,0	warp	#010-1_195_114	0,0,004-1,33,110
-010-1,174,111,0	warp	#010-1_174_111	0,0,004-1,33,110
-010-1,187,102,0	warp	#010-1_187_102	0,0,004-1,33,110
-010-1,222,110,0	warp	#010-1_222_110	0,0,004-1,33,110
-010-1,224,109,0	warp	#010-1_224_109	0,0,004-1,33,110
-010-1,192,68,0	warp	#010-1_192_68	0,0,004-1,33,110
-010-1,205,80,0	warp	#010-1_205_80	0,0,004-1,33,110
-010-1,217,66,0	warp	#010-1_217_66	0,0,004-1,33,110
-010-1,226,57,0	warp	#010-1_226_57	0,0,004-1,33,110
-010-1,283,95,0	warp	#010-1_283_95	0,0,004-1,33,110
-010-1,282,91,0	warp	#010-1_282_91	0,0,004-1,33,110
-010-1,269,63,0	warp	#010-1_269_63	0,0,004-1,33,110
-010-1,242,70,0	warp	#010-1_242_70	0,0,004-1,33,110
-010-1,239,41,0	warp	#010-1_239_41	0,0,004-1,33,110
-010-1,273,41,0	warp	#010-1_273_41	0,0,004-1,33,110
-010-1,105,132,0	warp	#010-1_105_132	0,0,004-1,33,110
-010-1,42,137,0	warp	#010-1_42_137	0,0,004-1,33,110
-010-1,46,131,0	warp	#010-1_46_131	0,0,004-1,33,110
-010-1,201,18,0	warp	#010-1_201_18	0,0,004-1,33,110
+010-1,92,17,0	warp	#010-1_92_17	0,0,004-1,33,110
+010-1,89,27,0	warp	#010-1_89_27	0,0,004-1,33,110
+010-1,96,30,0	warp	#010-1_96_30	0,0,004-1,33,110
+010-1,87,36,0	warp	#010-1_87_36	0,0,004-1,33,110
+010-1,62,54,0	warp	#010-1_62_54	0,0,004-1,33,110
+010-1,52,50,0	warp	#010-1_52_50	0,0,004-1,33,110
+010-1,47,48,0	warp	#010-1_47_48	0,0,004-1,33,110
+010-1,50,63,0	warp	#010-1_50_63	0,0,004-1,33,110
+010-1,45,70,0	warp	#010-1_45_70	0,0,004-1,33,110
+010-1,59,76,0	warp	#010-1_59_76	0,0,004-1,33,110
+010-1,53,90,0	warp	#010-1_53_90	0,0,004-1,33,110
+010-1,81,88,0	warp	#010-1_81_88	0,0,004-1,33,110
+010-1,78,80,0	warp	#010-1_78_80	0,0,004-1,33,110
+010-1,65,73,0	warp	#010-1_65_73	0,0,004-1,33,110
+010-1,122,89,0	warp	#010-1_122_89	0,0,004-1,33,110
+010-1,110,81,0	warp	#010-1_110_81	0,0,004-1,33,110
+010-1,93,66,0	warp	#010-1_93_66	0,0,004-1,33,110
+010-1,76,66,0	warp	#010-1_76_66	0,0,004-1,33,110
+010-1,68,60,0	warp	#010-1_68_60	0,0,004-1,33,110
+010-1,75,52,0	warp	#010-1_75_52	0,0,004-1,33,110
+010-1,126,60,0	warp	#010-1_126_60	0,0,004-1,33,110
+010-1,88,48,0	warp	#010-1_88_48	0,0,004-1,33,110
+010-1,92,45,0	warp	#010-1_92_45	0,0,004-1,33,110
+010-1,108,38,0	warp	#010-1_108_38	0,0,004-1,33,110
+010-1,124,24,0	warp	#010-1_124_24	0,0,004-1,33,110
+010-1,105,27,0	warp	#010-1_105_27	0,0,004-1,33,110
+010-1,42,32,0	warp	#010-1_42_32	0,0,004-1,33,110
+010-1,46,26,0	warp	#010-1_46_26	0,0,004-1,33,110
diff --git a/npc/_import.txt b/npc/_import.txt
index ab2f69cf5..644ac5f35 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -40,6 +40,7 @@
 @include "npc/009-5/_import.txt"
 @include "npc/010-1-1/_import.txt"
 @include "npc/010-1/_import.txt"
+@include "npc/010-2/_import.txt"
 @include "npc/boss/_import.txt"
 @include "npc/botcheck/_import.txt"
 @include "npc/sec_pri/_import.txt"