add 010-1 desert canyon to halin

8 files changed, 21 insertions, 8 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 5629bdc3d..66ee8a605 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -54,6 +54,7 @@ map_list: (
     "009-1",
     "009-2",
     "009-5",
+    "010-1",
     "boss",
     "botcheck",
     "sec_pri",
diff --git a/db/map_index.txt b/db/map_index.txt
index 9520688bc..36a9c7031 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -51,10 +51,11 @@
 009-1 51
 009-2 52
 009-5 53
-boss 54
-botcheck 55
-sec_pri 56
-soren-2 57
-soren 58
-test 59
-testbg 60
+010-1 54
+boss 55
+botcheck 56
+sec_pri 57
+soren-2 58
+soren 59
+test 60
+testbg 61
diff --git a/maps/re/010-1.mcache b/maps/re/010-1.mcache
new file mode 100644
index 000000000..99e69e7ff
--- /dev/null
+++ b/maps/re/010-1.mcache
diff --git a/npc/005-1/_import.txt b/npc/005-1/_import.txt
index 9934b6a3c..2540b11af 100644
--- a/npc/005-1/_import.txt
+++ b/npc/005-1/_import.txt
@@ -10,5 +10,5 @@
 "npc/005-1/soul-menhir.txt",
 "npc/005-1/vincent.txt",
 "npc/005-1/warpcandorbattle.txt",
+"npc/005-1/wateranimation.txt",
 "npc/005-1/zegas.txt",
-"npc/005-1/wateranimation.txt",
\ No newline at end of file
diff --git a/npc/010-1/_import.txt b/npc/010-1/_import.txt
new file mode 100644
index 000000000..3d09583f9
--- /dev/null
+++ b/npc/010-1/_import.txt
@@ -0,0 +1,4 @@
+// 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
new file mode 100644
index 000000000..1d3e1ae9e
--- /dev/null
+++ b/npc/010-1/_mobs.txt
@@ -0,0 +1,3 @@
+// 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
diff --git a/npc/010-1/_warps.txt b/npc/010-1/_warps.txt
new file mode 100644
index 000000000..4187f901f
--- /dev/null
+++ b/npc/010-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 010-1: Desert Mountains warps
+010-1,27,245,0	warp	#010-1_27_245	0,0,004-1,119,94
diff --git a/npc/_import.txt b/npc/_import.txt
index 9741e53ce..27389b3c2 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -53,6 +53,7 @@
 @include "npc/009-1/_import.txt"
 @include "npc/009-2/_import.txt"
 @include "npc/009-5/_import.txt"
+@include "npc/010-1/_import.txt"
 @include "npc/boss/_import.txt"
 @include "npc/botcheck/_import.txt"
 @include "npc/sec_pri/_import.txt"