summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt15
-rw-r--r--maps/re/000-0-0.mcachebin58 -> 60 bytes
-rw-r--r--maps/re/000-0.mcachebin55 -> 60 bytes
-rw-r--r--maps/re/021-1.mcachebin0 -> 3204 bytes
-rw-r--r--npc/019-2/_import.txt1
-rw-r--r--npc/019-2/_warps.txt3
-rw-r--r--npc/021-1/_import.txt3
-rw-r--r--npc/021-1/_warps.txt6
-rw-r--r--npc/_import.txt1
10 files changed, 23 insertions, 7 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index c6bd46073..ee14e119a 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -104,6 +104,7 @@ map_list: (
"019-1-1",
"019-1",
"019-2",
+ "021-1",
"boss",
"botcheck",
"sec_pri",
diff --git a/db/map_index.txt b/db/map_index.txt
index b417a3780..d122576dd 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -101,10 +101,11 @@
019-1-1 101
019-1 102
019-2 103
-boss 104
-botcheck 105
-sec_pri 106
-soren-2 107
-soren 108
-test 109
-testbg 110
+021-1 104
+boss 105
+botcheck 106
+sec_pri 107
+soren-2 108
+soren 109
+test 110
+testbg 111
diff --git a/maps/re/000-0-0.mcache b/maps/re/000-0-0.mcache
index d348c3328..4108ae0e5 100644
--- a/maps/re/000-0-0.mcache
+++ b/maps/re/000-0-0.mcache
Binary files differ
diff --git a/maps/re/000-0.mcache b/maps/re/000-0.mcache
index 1455bac08..f46439fa6 100644
--- a/maps/re/000-0.mcache
+++ b/maps/re/000-0.mcache
Binary files differ
diff --git a/maps/re/021-1.mcache b/maps/re/021-1.mcache
new file mode 100644
index 000000000..ce4c695b0
--- /dev/null
+++ b/maps/re/021-1.mcache
Binary files differ
diff --git a/npc/019-2/_import.txt b/npc/019-2/_import.txt
index d4169912c..5eda4091c 100644
--- a/npc/019-2/_import.txt
+++ b/npc/019-2/_import.txt
@@ -1,3 +1,4 @@
// Map 019-2: Nivalis Port
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/019-2/_mobs.txt",
+"npc/019-2/_warps.txt",
diff --git a/npc/019-2/_warps.txt b/npc/019-2/_warps.txt
new file mode 100644
index 000000000..272db1592
--- /dev/null
+++ b/npc/019-2/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 019-2: Nivalis Port warps
+019-2,76,24,0 warp #019-2_76_24 0,0,021-1,212,299
diff --git a/npc/021-1/_import.txt b/npc/021-1/_import.txt
new file mode 100644
index 000000000..292821262
--- /dev/null
+++ b/npc/021-1/_import.txt
@@ -0,0 +1,3 @@
+// Map 021-1: Ice Labyrinth
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/021-1/_warps.txt",
diff --git a/npc/021-1/_warps.txt b/npc/021-1/_warps.txt
new file mode 100644
index 000000000..31416f969
--- /dev/null
+++ b/npc/021-1/_warps.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 021-1: Ice Labyrinth warps
+021-1,103,40,0 warp #021-1_103_40 0,0,021-1,200,49
+021-1,183,282,0 warp #021-1_183_282 0,0,021-1,158,282
+021-1,159,282,0 warp #021-1_159_282 0,0,021-1,184,282
+021-1,212,300,0 warp #021-1_212_300 0,0,019-2,76,25
diff --git a/npc/_import.txt b/npc/_import.txt
index 24890f67d..13cb320f0 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -103,6 +103,7 @@
@include "npc/019-1-1/_import.txt"
@include "npc/019-1/_import.txt"
@include "npc/019-2/_import.txt"
+@include "npc/021-1/_import.txt"
@include "npc/boss/_import.txt"
@include "npc/botcheck/_import.txt"
@include "npc/sec_pri/_import.txt"