summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt17
-rw-r--r--maps/re/019-1-1.mcachebin0 -> 98 bytes
-rw-r--r--maps/re/019-1.mcachebin598 -> 610 bytes
-rw-r--r--npc/014-5/sign.txt2
-rw-r--r--npc/019-1-1/_import.txt3
-rw-r--r--npc/019-1-1/_warps.txt3
-rw-r--r--npc/019-1/_warps.txt1
-rw-r--r--npc/_import.txt1
9 files changed, 20 insertions, 8 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 2d1e26588..71a8ca13b 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -99,6 +99,7 @@ map_list: (
"018-4-2",
"018-4",
"018-5",
+ "019-1-1",
"019-1",
"boss",
"botcheck",
diff --git a/db/map_index.txt b/db/map_index.txt
index 7db57e7f2..a1f38c839 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -96,11 +96,12 @@
018-4-2 96
018-4 97
018-5 98
-019-1 99
-boss 100
-botcheck 101
-sec_pri 102
-soren-2 103
-soren 104
-test 105
-testbg 106
+019-1-1 99
+019-1 100
+boss 101
+botcheck 102
+sec_pri 103
+soren-2 104
+soren 105
+test 106
+testbg 107
diff --git a/maps/re/019-1-1.mcache b/maps/re/019-1-1.mcache
new file mode 100644
index 000000000..eb1297619
--- /dev/null
+++ b/maps/re/019-1-1.mcache
Binary files differ
diff --git a/maps/re/019-1.mcache b/maps/re/019-1.mcache
index ed8613f06..321bf7af6 100644
--- a/maps/re/019-1.mcache
+++ b/maps/re/019-1.mcache
Binary files differ
diff --git a/npc/014-5/sign.txt b/npc/014-5/sign.txt
index 422cd3d80..c4018c1f4 100644
--- a/npc/014-5/sign.txt
+++ b/npc/014-5/sign.txt
@@ -8,8 +8,10 @@
mesc l("Welcome to the Greenlands, the place cursed by the Monster King to be ice forever, and now known as Icelands.");
next;
mesc l("It's advised to come ready for the cold, the hungry beasts, and other dangers snow may bring.");
+ /*
next;
mesc l("WARNING: Path temporaly closed due strong snowstorm."), 3;
+ */
close;
OnInit:
diff --git a/npc/019-1-1/_import.txt b/npc/019-1-1/_import.txt
new file mode 100644
index 000000000..0dd8ae92d
--- /dev/null
+++ b/npc/019-1-1/_import.txt
@@ -0,0 +1,3 @@
+// Map 019-1-1: Miller's House
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/019-1-1/_warps.txt",
diff --git a/npc/019-1-1/_warps.txt b/npc/019-1-1/_warps.txt
new file mode 100644
index 000000000..f5764e2b8
--- /dev/null
+++ b/npc/019-1-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 019-1-1: Miller's House warps
+019-1-1,33,42,0 warp #019-1-1_33_42 0,0,019-1,84,59
diff --git a/npc/019-1/_warps.txt b/npc/019-1/_warps.txt
index c8e84a466..603b4c279 100644
--- a/npc/019-1/_warps.txt
+++ b/npc/019-1/_warps.txt
@@ -1,3 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 019-1: Snow Field warps
019-1,61,102,0 warp #019-1_61_102 3,0,014-5,192,17
+019-1,84,53,0 warp #019-1_84_53 0,0,019-1-1,33,41
diff --git a/npc/_import.txt b/npc/_import.txt
index dfda64b20..1df91b4d4 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -98,6 +98,7 @@
@include "npc/018-4-2/_import.txt"
@include "npc/018-4/_import.txt"
@include "npc/018-5/_import.txt"
+@include "npc/019-1-1/_import.txt"
@include "npc/019-1/_import.txt"
@include "npc/boss/_import.txt"
@include "npc/botcheck/_import.txt"