8 files changed, 34 insertions, 20 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index b2340d2c0..10eb1e428 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -30,6 +30,7 @@ map_list: (
     "004-2-1",
     "004-2",
     "005-1",
+    "005-2-1",
     "005-2",
     "005-3",
     "005-4",
diff --git a/db/map_index.txt b/db/map_index.txt
index 9f6e2e787..a455184ba 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -27,23 +27,24 @@
 004-2-1 27
 004-2 28
 005-1 29
-005-2 30
-005-3 31
-005-4 32
-005-5 33
-005-6 34
-005-7 35
-007-1 36
-009-1 37
-010-1-1 38
-010-1 39
-010-2 40
-011-1 41
-011-2 42
-boss 43
-botcheck 44
-sec_pri 45
-soren-2 46
-soren 47
-test 48
-testbg 49
+005-2-1 30
+005-2 31
+005-3 32
+005-4 33
+005-5 34
+005-6 35
+005-7 36
+007-1 37
+009-1 38
+010-1-1 39
+010-1 40
+010-2 41
+011-1 42
+011-2 43
+boss 44
+botcheck 45
+sec_pri 46
+soren-2 47
+soren 48
+test 49
+testbg 50
diff --git a/maps/re/005-2-1.mcache b/maps/re/005-2-1.mcache
new file mode 100644
index 000000000..56744e7b5
--- /dev/null
+++ b/maps/re/005-2-1.mcache
diff --git a/npc/005-2-1/_import.txt b/npc/005-2-1/_import.txt
new file mode 100644
index 000000000..c9b4ade92
--- /dev/null
+++ b/npc/005-2-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 005-2-1: Saxso's Basement
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/005-2-1/_mobs.txt",
+"npc/005-2-1/_warps.txt",
diff --git a/npc/005-2-1/_mobs.txt b/npc/005-2-1/_mobs.txt
new file mode 100644
index 000000000..e69781103
--- /dev/null
+++ b/npc/005-2-1/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 005-2-1: Saxso's Basement mobs
+005-2-1,34,38,10,3	monster	Lava Slime	1097,7,36000,300000
diff --git a/npc/005-2-1/_warps.txt b/npc/005-2-1/_warps.txt
new file mode 100644
index 000000000..31167fe08
--- /dev/null
+++ b/npc/005-2-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 005-2-1: Saxso's Basement warps
+005-2-1,28,34,0	warp	#005-2-1_28_34	0,0,005-2,25,36
diff --git a/npc/005-2/_import.txt b/npc/005-2/_import.txt
index d5850de36..09564f7d6 100644
--- a/npc/005-2/_import.txt
+++ b/npc/005-2/_import.txt
@@ -3,3 +3,4 @@
 "npc/005-2/_mobs.txt",
 "npc/005-2/_warps.txt",
 "npc/005-2/saxsochest.txt",
+"npc/005-2/trapdoor.txt",
diff --git a/npc/_import.txt b/npc/_import.txt
index 3f915ba30..b8f1a3822 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -29,6 +29,7 @@
 @include "npc/004-2-1/_import.txt"
 @include "npc/004-2/_import.txt"
 @include "npc/005-1/_import.txt"
+@include "npc/005-2-1/_import.txt"
 @include "npc/005-2/_import.txt"
 @include "npc/005-3/_import.txt"
 @include "npc/005-4/_import.txt"