summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt99
-rw-r--r--maps/re/017-1.mcachebin4239 -> 4242 bytes
-rw-r--r--maps/re/018-6-2.mcachebin0 -> 543 bytes
-rw-r--r--npc/018-6-2/_import.txt2
-rw-r--r--npc/_import.txt1
6 files changed, 54 insertions, 49 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 733e5f357..070af3756 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -129,6 +129,7 @@ map_list: (
"018-5",
"018-6-0",
"018-6-1",
+ "018-6-2",
"019-1-1",
"019-1",
"019-2",
diff --git a/db/map_index.txt b/db/map_index.txt
index 3cf92e99f..f50043de0 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -126,52 +126,53 @@
018-5 126
018-6-0 127
018-6-1 128
-019-1-1 129
-019-1 130
-019-2 131
-019-3 132
-019-4-1 133
-019-4 134
-020-1 135
-020-2 136
-020-3 137
-020-4 138
-020-5 139
-020-6 140
-020-7-1 141
-020-7-2 142
-020-7 143
-021-1 144
-021-2 145
-021-3 146
-021-4 147
-022-1 148
-023-1 149
-023-2 150
-023-3-1 151
-023-3-2 152
-023-3 153
-024-1 154
-024-10 155
-024-11 156
-024-12 157
-024-13 158
-024-14 159
-024-15 160
-024-16 161
-024-2 162
-024-3 163
-024-4 164
-024-5 165
-024-6 166
-024-7 167
-024-8 168
-024-9 169
-boss 170
-botcheck 171
-guilds 172
-sec_pri 173
-soren-2 174
-soren 175
-test 176
-testbg 177
+018-6-2 129
+019-1-1 130
+019-1 131
+019-2 132
+019-3 133
+019-4-1 134
+019-4 135
+020-1 136
+020-2 137
+020-3 138
+020-4 139
+020-5 140
+020-6 141
+020-7-1 142
+020-7-2 143
+020-7 144
+021-1 145
+021-2 146
+021-3 147
+021-4 148
+022-1 149
+023-1 150
+023-2 151
+023-3-1 152
+023-3-2 153
+023-3 154
+024-1 155
+024-10 156
+024-11 157
+024-12 158
+024-13 159
+024-14 160
+024-15 161
+024-16 162
+024-2 163
+024-3 164
+024-4 165
+024-5 166
+024-6 167
+024-7 168
+024-8 169
+024-9 170
+boss 171
+botcheck 172
+guilds 173
+sec_pri 174
+soren-2 175
+soren 176
+test 177
+testbg 178
diff --git a/maps/re/017-1.mcache b/maps/re/017-1.mcache
index 8e0460974..291b35397 100644
--- a/maps/re/017-1.mcache
+++ b/maps/re/017-1.mcache
Binary files differ
diff --git a/maps/re/018-6-2.mcache b/maps/re/018-6-2.mcache
new file mode 100644
index 000000000..f72c6cf46
--- /dev/null
+++ b/maps/re/018-6-2.mcache
Binary files differ
diff --git a/npc/018-6-2/_import.txt b/npc/018-6-2/_import.txt
new file mode 100644
index 000000000..9a8d640ce
--- /dev/null
+++ b/npc/018-6-2/_import.txt
@@ -0,0 +1,2 @@
+// Map 018-6-2: Forgotten Hall
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
diff --git a/npc/_import.txt b/npc/_import.txt
index c877bae5d..9aacd583a 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -128,6 +128,7 @@
@include "npc/018-5/_import.txt"
@include "npc/018-6-0/_import.txt"
@include "npc/018-6-1/_import.txt"
+@include "npc/018-6-2/_import.txt"
@include "npc/019-1-1/_import.txt"
@include "npc/019-1/_import.txt"
@include "npc/019-2/_import.txt"