7 files changed, 53 insertions, 43 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 3265a8f46..312d2e5d8 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -117,6 +117,7 @@ map_list: (
     "018-4-2",
     "018-4",
     "018-5-1",
+    "018-5-2",
     "018-5-boss",
     "018-5",
     "019-1-1",
diff --git a/db/map_index.txt b/db/map_index.txt
index 7f8ebf8a0..0180c573b 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -114,46 +114,47 @@
 018-4-2 114
 018-4 115
 018-5-1 116
-018-5-boss 117
-018-5 118
-019-1-1 119
-019-1 120
-019-2 121
-019-3 122
-019-4-1 123
-019-4 124
-020-1 125
-020-2 126
-020-3 127
-020-4 128
-020-5 129
-020-6 130
-021-1 131
-021-2 132
-021-3 133
-021-4 134
-022-1 135
-023-1 136
-023-2 137
-024-1 138
-024-10 139
-024-11 140
-024-12 141
-024-13 142
-024-14 143
-024-2 144
-024-3 145
-024-4 146
-024-5 147
-024-6 148
-024-7 149
-024-8 150
-024-9 151
-boss 152
-botcheck 153
-guilds 154
-sec_pri 155
-soren-2 156
-soren 157
-test 158
-testbg 159
+018-5-2 117
+018-5-boss 118
+018-5 119
+019-1-1 120
+019-1 121
+019-2 122
+019-3 123
+019-4-1 124
+019-4 125
+020-1 126
+020-2 127
+020-3 128
+020-4 129
+020-5 130
+020-6 131
+021-1 132
+021-2 133
+021-3 134
+021-4 135
+022-1 136
+023-1 137
+023-2 138
+024-1 139
+024-10 140
+024-11 141
+024-12 142
+024-13 143
+024-14 144
+024-2 145
+024-3 146
+024-4 147
+024-5 148
+024-6 149
+024-7 150
+024-8 151
+024-9 152
+boss 153
+botcheck 154
+guilds 155
+sec_pri 156
+soren-2 157
+soren 158
+test 159
+testbg 160
diff --git a/maps/re/018-5-2.mcache b/maps/re/018-5-2.mcache
new file mode 100644
index 000000000..01990dc0f
--- /dev/null
+++ b/maps/re/018-5-2.mcache
diff --git a/npc/018-5-2/_import.txt b/npc/018-5-2/_import.txt
new file mode 100644
index 000000000..9835e17fe
--- /dev/null
+++ b/npc/018-5-2/_import.txt
@@ -0,0 +1,3 @@
+// Map 018-5-2: Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/018-5-2/_warps.txt",
diff --git a/npc/018-5-2/_warps.txt b/npc/018-5-2/_warps.txt
new file mode 100644
index 000000000..0465f075d
--- /dev/null
+++ b/npc/018-5-2/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 018-5-2: Indoors warps
+018-5-2,33,47,0	warp	#018-5-2_33_47	1,0,018-5,114,55
diff --git a/npc/018-5/_warps.txt b/npc/018-5/_warps.txt
index cde18dc75..250a8c718 100644
--- a/npc/018-5/_warps.txt
+++ b/npc/018-5/_warps.txt
@@ -3,3 +3,4 @@
 018-5,99,82,0	warp	#018-5_99_82	0,0,018-5-1,79,67
 018-5,97,68,0	warp	#018-5_97_68	0,0,018-5-1,77,53
 018-5,60,146,0	warp	#018-5_60_146	0,0,018-5-1,36,98
+018-5,114,54,0	warp	#018-5_114_54	0,0,018-5-2,32,46
diff --git a/npc/_import.txt b/npc/_import.txt
index 0aae0646c..046ca49b6 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -116,6 +116,7 @@
 @include "npc/018-4-2/_import.txt"
 @include "npc/018-4/_import.txt"
 @include "npc/018-5-1/_import.txt"
+@include "npc/018-5-2/_import.txt"
 @include "npc/018-5-boss/_import.txt"
 @include "npc/018-5/_import.txt"
 @include "npc/019-1-1/_import.txt"