Make maps - accept 018-5-1

8 files changed, 59 insertions, 42 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index ebefaf855..7cfdd6699 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -116,6 +116,7 @@ map_list: (
     "018-4-1",
     "018-4-2",
     "018-4",
+    "018-5-1",
     "018-5",
     "019-1-1",
     "019-1",
diff --git a/db/map_index.txt b/db/map_index.txt
index 67cb67764..eed416278 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -113,45 +113,46 @@
 018-4-1 113
 018-4-2 114
 018-4 115
-018-5 116
-019-1-1 117
-019-1 118
-019-2 119
-019-3 120
-019-4-1 121
-019-4 122
-020-1 123
-020-2 124
-020-3 125
-020-4 126
-020-5 127
-020-6 128
-021-1 129
-021-2 130
-021-3 131
-021-4 132
-022-1 133
-023-1 134
-023-2 135
-024-1 136
-024-10 137
-024-11 138
-024-12 139
-024-13 140
-024-14 141
-024-2 142
-024-3 143
-024-4 144
-024-5 145
-024-6 146
-024-7 147
-024-8 148
-024-9 149
-boss 150
-botcheck 151
-guilds 152
-sec_pri 153
-soren-2 154
-soren 155
-test 156
-testbg 157
+018-5-1 116
+018-5 117
+019-1-1 118
+019-1 119
+019-2 120
+019-3 121
+019-4-1 122
+019-4 123
+020-1 124
+020-2 125
+020-3 126
+020-4 127
+020-5 128
+020-6 129
+021-1 130
+021-2 131
+021-3 132
+021-4 133
+022-1 134
+023-1 135
+023-2 136
+024-1 137
+024-10 138
+024-11 139
+024-12 140
+024-13 141
+024-14 142
+024-2 143
+024-3 144
+024-4 145
+024-5 146
+024-6 147
+024-7 148
+024-8 149
+024-9 150
+boss 151
+botcheck 152
+guilds 153
+sec_pri 154
+soren-2 155
+soren 156
+test 157
+testbg 158
diff --git a/maps/re/018-5-1.mcache b/maps/re/018-5-1.mcache
new file mode 100644
index 000000000..56cab9f2f
--- /dev/null
+++ b/maps/re/018-5-1.mcache
diff --git a/npc/018-5-1/_import.txt b/npc/018-5-1/_import.txt
new file mode 100644
index 000000000..b04b339ec
--- /dev/null
+++ b/npc/018-5-1/_import.txt
@@ -0,0 +1,3 @@
+// Map 018-5-1: Mountain Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/018-5-1/_warps.txt",
diff --git a/npc/018-5-1/_warps.txt b/npc/018-5-1/_warps.txt
new file mode 100644
index 000000000..d3a3e60c2
--- /dev/null
+++ b/npc/018-5-1/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 018-5-1: Mountain Cave warps
+018-5-1,36,99,0	warp	#018-5-1_36_99	0,0,018-5,60,147
+018-5-1,79,68,0	warp	#018-5-1_79_68	0,0,018-5,99,83
+018-5-1,77,54,0	warp	#018-5-1_77_54	0,0,018-5,97,69
diff --git a/npc/018-5/_import.txt b/npc/018-5/_import.txt
index aa575340c..d827bfe88 100644
--- a/npc/018-5/_import.txt
+++ b/npc/018-5/_import.txt
@@ -1,4 +1,5 @@
 // Map 018-5: Lilit Island
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/018-5/_mobs.txt",
+"npc/018-5/_warps.txt",
 "npc/018-5/soul_menhir.txt",
diff --git a/npc/018-5/_warps.txt b/npc/018-5/_warps.txt
new file mode 100644
index 000000000..cde18dc75
--- /dev/null
+++ b/npc/018-5/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 018-5: Lilit Island warps
+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
diff --git a/npc/_import.txt b/npc/_import.txt
index 3ce4af1b4..02af9f73d 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -115,6 +115,7 @@
 @include "npc/018-4-1/_import.txt"
 @include "npc/018-4-2/_import.txt"
 @include "npc/018-4/_import.txt"
+@include "npc/018-5-1/_import.txt"
 @include "npc/018-5/_import.txt"
 @include "npc/019-1-1/_import.txt"
 @include "npc/019-1/_import.txt"