summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf2
-rw-r--r--db/map_index.txt82
-rw-r--r--maps/re/014-2-1.mcachebin0 -> 96 bytes
-rw-r--r--maps/re/019-2.mcachebin0 -> 695 bytes
-rw-r--r--npc/014-2-1/_import.txt3
-rw-r--r--npc/014-2-1/_warps.txt3
-rw-r--r--npc/019-2/_import.txt3
-rw-r--r--npc/019-2/_mobs.txt7
-rw-r--r--npc/_import.txt2
9 files changed, 62 insertions, 40 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 40ddd7085..c6bd46073 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -69,6 +69,7 @@ map_list: (
"012-6",
"012-7",
"014-1",
+ "014-2-1",
"014-2",
"014-3",
"014-4",
@@ -102,6 +103,7 @@ map_list: (
"018-5",
"019-1-1",
"019-1",
+ "019-2",
"boss",
"botcheck",
"sec_pri",
diff --git a/db/map_index.txt b/db/map_index.txt
index e456b79f4..b417a3780 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -66,43 +66,45 @@
012-6 66
012-7 67
014-1 68
-014-2 69
-014-3 70
-014-4 71
-014-5 72
-015-1 73
-015-2 74
-015-3 75
-015-4 76
-015-5 77
-015-6 78
-015-7 79
-016-1 80
-016-6 81
-016-7 82
-017-1 83
-017-2-1 84
-017-2 85
-017-3 86
-017-4 87
-017-5 88
-017-6 89
-018-1-1 90
-018-1 91
-018-2-1 92
-018-2 93
-018-3-1 94
-018-3 95
-018-4-1 96
-018-4-2 97
-018-4 98
-018-5 99
-019-1-1 100
-019-1 101
-boss 102
-botcheck 103
-sec_pri 104
-soren-2 105
-soren 106
-test 107
-testbg 108
+014-2-1 69
+014-2 70
+014-3 71
+014-4 72
+014-5 73
+015-1 74
+015-2 75
+015-3 76
+015-4 77
+015-5 78
+015-6 79
+015-7 80
+016-1 81
+016-6 82
+016-7 83
+017-1 84
+017-2-1 85
+017-2 86
+017-3 87
+017-4 88
+017-5 89
+017-6 90
+018-1-1 91
+018-1 92
+018-2-1 93
+018-2 94
+018-3-1 95
+018-3 96
+018-4-1 97
+018-4-2 98
+018-4 99
+018-5 100
+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
diff --git a/maps/re/014-2-1.mcache b/maps/re/014-2-1.mcache
new file mode 100644
index 000000000..ab28ccbdf
--- /dev/null
+++ b/maps/re/014-2-1.mcache
Binary files differ
diff --git a/maps/re/019-2.mcache b/maps/re/019-2.mcache
new file mode 100644
index 000000000..1783f2fb1
--- /dev/null
+++ b/maps/re/019-2.mcache
Binary files differ
diff --git a/npc/014-2-1/_import.txt b/npc/014-2-1/_import.txt
new file mode 100644
index 000000000..9bf2c2f08
--- /dev/null
+++ b/npc/014-2-1/_import.txt
@@ -0,0 +1,3 @@
+// Map 014-2-1: Woody House
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/014-2-1/_warps.txt",
diff --git a/npc/014-2-1/_warps.txt b/npc/014-2-1/_warps.txt
new file mode 100644
index 000000000..5dec41a5e
--- /dev/null
+++ b/npc/014-2-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 014-2-1: Woody House warps
+014-2-1,33,45,0 warp #014-2-1_33_45 0,0,014-2,103,30
diff --git a/npc/019-2/_import.txt b/npc/019-2/_import.txt
new file mode 100644
index 000000000..d4169912c
--- /dev/null
+++ b/npc/019-2/_import.txt
@@ -0,0 +1,3 @@
+// 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",
diff --git a/npc/019-2/_mobs.txt b/npc/019-2/_mobs.txt
new file mode 100644
index 000000000..80729b125
--- /dev/null
+++ b/npc/019-2/_mobs.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 019-2: Nivalis Port mobs
+019-2,60,59,5,2 monster White Slime 1094,2,100000,30000
+019-2,73,53,42,36 monster Fluffy 1022,10,100000,30000
+019-2,50,85,4,13 monster Wind Fairy 1185,1,100000,30000
+019-2,98,76,11,33 monster Tipiu 1015,1,100000,30000
+019-2,70,104,36,21 monster Iced Fluffy 1041,7,100000,30000
diff --git a/npc/_import.txt b/npc/_import.txt
index ba0c7a502..24890f67d 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -68,6 +68,7 @@
@include "npc/012-6/_import.txt"
@include "npc/012-7/_import.txt"
@include "npc/014-1/_import.txt"
+@include "npc/014-2-1/_import.txt"
@include "npc/014-2/_import.txt"
@include "npc/014-3/_import.txt"
@include "npc/014-4/_import.txt"
@@ -101,6 +102,7 @@
@include "npc/018-5/_import.txt"
@include "npc/019-1-1/_import.txt"
@include "npc/019-1/_import.txt"
+@include "npc/019-2/_import.txt"
@include "npc/boss/_import.txt"
@include "npc/botcheck/_import.txt"
@include "npc/sec_pri/_import.txt"