summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt33
-rw-r--r--maps/re/017-1.mcachebin4292 -> 4291 bytes
-rw-r--r--maps/re/017-4.mcachebin0 -> 175 bytes
-rw-r--r--npc/017-1/_warps.txt2
-rw-r--r--npc/017-4/_import.txt2
-rw-r--r--npc/_import.txt1
7 files changed, 23 insertions, 16 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index cf7a51601..064a654f4 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -82,6 +82,7 @@ map_list: (
"017-2-1",
"017-2",
"017-3",
+ "017-4",
"018-1-1",
"018-1",
"018-2-1",
diff --git a/db/map_index.txt b/db/map_index.txt
index bbee690e1..949b6d21e 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -79,19 +79,20 @@
017-2-1 79
017-2 80
017-3 81
-018-1-1 82
-018-1 83
-018-2-1 84
-018-2 85
-018-3-1 86
-018-3 87
-018-4-1 88
-018-4-2 89
-018-4 90
-boss 91
-botcheck 92
-sec_pri 93
-soren-2 94
-soren 95
-test 96
-testbg 97
+017-4 82
+018-1-1 83
+018-1 84
+018-2-1 85
+018-2 86
+018-3-1 87
+018-3 88
+018-4-1 89
+018-4-2 90
+018-4 91
+boss 92
+botcheck 93
+sec_pri 94
+soren-2 95
+soren 96
+test 97
+testbg 98
diff --git a/maps/re/017-1.mcache b/maps/re/017-1.mcache
index 2839a3d3c..8d4d2125b 100644
--- a/maps/re/017-1.mcache
+++ b/maps/re/017-1.mcache
Binary files differ
diff --git a/maps/re/017-4.mcache b/maps/re/017-4.mcache
new file mode 100644
index 000000000..677cae64a
--- /dev/null
+++ b/maps/re/017-4.mcache
Binary files differ
diff --git a/npc/017-1/_warps.txt b/npc/017-1/_warps.txt
index a1437a724..120279689 100644
--- a/npc/017-1/_warps.txt
+++ b/npc/017-1/_warps.txt
@@ -6,3 +6,5 @@
017-1,119,60,0 warp #017-1_119_60 0,0,017-2,31,30
017-1,219,91,0 warp #017-1_219_91 0,0,014-4,95,33
017-1,55,143,0 warp #017-1_55_143 2,0,017-3,32,44
+017-1,150,87,0 warp #017-1_150_87 0,0,017-4,27,41
+017-1,155,87,0 warp #017-1_155_87 0,0,017-4,35,41
diff --git a/npc/017-4/_import.txt b/npc/017-4/_import.txt
new file mode 100644
index 000000000..cd24b9ee3
--- /dev/null
+++ b/npc/017-4/_import.txt
@@ -0,0 +1,2 @@
+// Map 017-4: Tech-User Forge
+// 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 8ce94c29e..a7400bae6 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -81,6 +81,7 @@
@include "npc/017-2-1/_import.txt"
@include "npc/017-2/_import.txt"
@include "npc/017-3/_import.txt"
+@include "npc/017-4/_import.txt"
@include "npc/018-1-1/_import.txt"
@include "npc/018-1/_import.txt"
@include "npc/018-2-1/_import.txt"