summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt19
-rw-r--r--maps/re/012-4.mcachebin0 -> 79 bytes
-rw-r--r--npc/012-1/_warps.txt1
-rw-r--r--npc/012-4/_import.txt3
-rw-r--r--npc/012-4/_warps.txt3
-rw-r--r--npc/_import.txt1
7 files changed, 19 insertions, 9 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 7683cd33a..f4d37d448 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -50,6 +50,7 @@ map_list: (
"012-1",
"012-2",
"012-3",
+ "012-4",
"014-1",
"015-1",
"boss",
diff --git a/db/map_index.txt b/db/map_index.txt
index a33388122..9290cbb90 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -47,12 +47,13 @@
012-1 47
012-2 48
012-3 49
-014-1 50
-015-1 51
-boss 52
-botcheck 53
-sec_pri 54
-soren-2 55
-soren 56
-test 57
-testbg 58
+012-4 50
+014-1 51
+015-1 52
+boss 53
+botcheck 54
+sec_pri 55
+soren-2 56
+soren 57
+test 58
+testbg 59
diff --git a/maps/re/012-4.mcache b/maps/re/012-4.mcache
new file mode 100644
index 000000000..400529d15
--- /dev/null
+++ b/maps/re/012-4.mcache
Binary files differ
diff --git a/npc/012-1/_warps.txt b/npc/012-1/_warps.txt
index 48a14b1ca..99f24b462 100644
--- a/npc/012-1/_warps.txt
+++ b/npc/012-1/_warps.txt
@@ -3,3 +3,4 @@
012-1,79,17,0 warp #012-1_79_17 3,0,014-1,78,97
012-1,65,55,0 warp #012-1_65_55 0,0,012-2,36,46
012-1,89,58,0 warp #012-1_89_58 0,0,012-3,41,45
+012-1,101,55,0 warp #012-1_101_55 0,0,012-4,35,30
diff --git a/npc/012-4/_import.txt b/npc/012-4/_import.txt
new file mode 100644
index 000000000..8bb7f52a8
--- /dev/null
+++ b/npc/012-4/_import.txt
@@ -0,0 +1,3 @@
+// Map 012-4: Alchemy Shop
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/012-4/_warps.txt",
diff --git a/npc/012-4/_warps.txt b/npc/012-4/_warps.txt
new file mode 100644
index 000000000..fb88327c2
--- /dev/null
+++ b/npc/012-4/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 012-4: Alchemy Shop warps
+012-4,35,31,0 warp #012-4_35_31 0,0,012-1,101,56
diff --git a/npc/_import.txt b/npc/_import.txt
index e80546ff1..6125ae7ce 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -49,6 +49,7 @@
@include "npc/012-1/_import.txt"
@include "npc/012-2/_import.txt"
@include "npc/012-3/_import.txt"
+@include "npc/012-4/_import.txt"
@include "npc/014-1/_import.txt"
@include "npc/015-1/_import.txt"
@include "npc/boss/_import.txt"