summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt21
-rw-r--r--maps/re/011-1.mcachebin3021 -> 3021 bytes
-rw-r--r--maps/re/015-2.mcachebin0 -> 2243 bytes
-rw-r--r--npc/014-3/_warps.txt1
-rw-r--r--npc/015-2/_import.txt4
-rw-r--r--npc/015-2/_mobs.txt50
-rw-r--r--npc/015-2/_warps.txt24
-rw-r--r--npc/_import.txt1
9 files changed, 92 insertions, 10 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 114b09138..af25e9126 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -63,6 +63,7 @@ map_list: (
"014-2",
"014-3",
"015-1",
+ "015-2",
"016-1",
"016-6",
"016-7",
diff --git a/db/map_index.txt b/db/map_index.txt
index 4d0ca3e4c..046576be9 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -60,13 +60,14 @@
014-2 60
014-3 61
015-1 62
-016-1 63
-016-6 64
-016-7 65
-boss 66
-botcheck 67
-sec_pri 68
-soren-2 69
-soren 70
-test 71
-testbg 72
+015-2 63
+016-1 64
+016-6 65
+016-7 66
+boss 67
+botcheck 68
+sec_pri 69
+soren-2 70
+soren 71
+test 72
+testbg 73
diff --git a/maps/re/011-1.mcache b/maps/re/011-1.mcache
index c47677811..6e5ed3533 100644
--- a/maps/re/011-1.mcache
+++ b/maps/re/011-1.mcache
Binary files differ
diff --git a/maps/re/015-2.mcache b/maps/re/015-2.mcache
new file mode 100644
index 000000000..152d254a0
--- /dev/null
+++ b/maps/re/015-2.mcache
Binary files differ
diff --git a/npc/014-3/_warps.txt b/npc/014-3/_warps.txt
index c3e787df0..35818b14c 100644
--- a/npc/014-3/_warps.txt
+++ b/npc/014-3/_warps.txt
@@ -1,3 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 014-3: Woodlands Central Area warps
014-3,224,111,0 warp #014-3_224_111 0,4,012-1,23,61
+014-3,138,86,0 warp #014-3_138_86 0,0,015-2,49,100
diff --git a/npc/015-2/_import.txt b/npc/015-2/_import.txt
new file mode 100644
index 000000000..e7f8ad2b8
--- /dev/null
+++ b/npc/015-2/_import.txt
@@ -0,0 +1,4 @@
+// Map 015-2: Bandit Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/015-2/_mobs.txt",
+"npc/015-2/_warps.txt",
diff --git a/npc/015-2/_mobs.txt b/npc/015-2/_mobs.txt
new file mode 100644
index 000000000..2514e4c33
--- /dev/null
+++ b/npc/015-2/_mobs.txt
@@ -0,0 +1,50 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-2: Bandit Cave mobs
+015-2,152,72,141,63 monster Silk Worm 1034,9,30000,100000
+015-2,263,38,15,17 monster Bandit 1024,1,30000,30000
+015-2,262,114,19,19 monster Bandit 1024,1,30000,30000
+015-2,132,119,8,10 monster Bandit 1024,1,30000,30000
+015-2,170,66,8,10 monster Bandit 1024,1,30000,30000
+015-2,67,70,8,10 monster Bandit 1024,1,30000,30000
+015-2,196,107,8,10 monster Bandit 1024,1,30000,30000
+015-2,196,29,8,10 monster Bandit 1024,1,30000,30000
+015-2,36,37,8,10 monster Bandit 1024,1,30000,30000
+015-2,112,40,22,24 monster Bandit 1024,2,30000,60000
+015-2,31,99,8,10 monster Bandit 1024,1,30000,30000
+015-2,223,250,61,32 monster Bat 1039,5,30000,100000
+015-2,270,175,13,12 monster Bat 1039,3,30000,100000
+015-2,257,77,2,63 monster Bat 1039,6,30000,100000
+015-2,192,77,2,63 monster Bat 1039,9,30000,100000
+015-2,167,110,43,6 monster Bat 1039,9,30000,100000
+015-2,75,70,52,48 monster Bat 1039,21,30000,100000
+015-2,78,195,64,48 monster Bat 1039,9,30000,100000
+015-2,168,109,18,18 monster Snake 1122,3,30000,100000
+015-2,199,76,18,18 monster Snake 1122,3,30000,100000
+015-2,88,163,14,13 monster Snake 1122,3,30000,100000
+015-2,48,113,17,9 monster Snake 1122,3,30000,100000
+015-2,177,94,10,14 monster Angry Red Scorpion 1130,4,30000,100000
+015-2,194,49,10,14 monster Angry Red Scorpion 1130,2,30000,100000
+015-2,51,115,23,12 monster Angry Red Scorpion 1130,2,30000,100000
+015-2,63,169,6,8 monster Angry Red Scorpion 1130,2,30000,100000
+015-2,100,226,14,7 monster Snake 1122,3,30000,100000
+015-2,260,44,26,8 monster Snake 1122,3,30000,100000
+015-2,272,48,10,14 monster Angry Red Scorpion 1130,2,30000,100000
+015-2,95,78,15,12 monster Yellow Slime 1091,3,30000,100000
+015-2,59,36,9,12 monster Yellow Slime 1091,3,30000,100000
+015-2,26,69,9,12 monster Yellow Slime 1091,3,30000,100000
+015-2,61,101,7,5 monster Yellow Slime 1091,3,30000,100000
+015-2,50,61,4,6 monster Yellow Slime 1091,2,30000,100000
+015-2,128,39,4,6 monster Yellow Slime 1091,2,30000,100000
+015-2,41,178,4,6 monster Yellow Slime 1091,1,30000,100000
+015-2,70,229,4,6 monster Yellow Slime 1091,1,30000,100000
+015-2,20,204,4,6 monster Yellow Slime 1091,1,30000,100000
+015-2,114,190,4,6 monster Yellow Slime 1091,3,30000,100000
+015-2,137,205,4,6 monster Yellow Slime 1091,2,30000,100000
+015-2,79,220,14,7 monster Cave Snake 1035,3,30000,100000
+015-2,115,210,14,7 monster Cave Snake 1035,3,30000,100000
+015-2,41,193,15,15 monster Cave Snake 1035,3,30000,100000
+015-2,70,143,15,15 monster Cave Snake 1035,3,30000,100000
+015-2,97,183,14,7 monster Cave Snake 1035,3,30000,100000
+015-2,172,252,4,6 monster Cave Maggot 1027,4,30000,100000
+015-2,263,236,8,2 monster Cave Maggot 1027,3,30000,100000
+015-2,143,128,140,125 monster Small Diamond Biff 1107,8,30000,100000
diff --git a/npc/015-2/_warps.txt b/npc/015-2/_warps.txt
new file mode 100644
index 000000000..ac0e3650d
--- /dev/null
+++ b/npc/015-2/_warps.txt
@@ -0,0 +1,24 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-2: Bandit Cave warps
+015-2,51,75,0 warp #015-2_51_75 0,0,105-2,260,127
+015-2,61,71,0 warp #015-2_61_71 0,0,015-2,270,124
+015-2,270,125,0 warp #015-2_270_125 0,0,015-2,61,72
+015-2,260,128,0 warp #015-2_260_128 0,0,015-2,51,76
+015-2,145,118,0 warp #015-2_145_118 0,0,015-2,47,119
+015-2,196,26,0 warp #015-2_196_26 0,0,015-2,261,46
+015-2,261,47,0 warp #015-2_261_47 0,0,015-2,196,27
+015-2,271,52,0 warp #015-2_271_52 0,0,015-2,98,31
+015-2,98,30,0 warp #015-2_98_30 0,0,015-2,271,51
+015-2,47,120,0 warp #015-2_47_120 0,0,015-2,145,117
+015-2,49,101,0 warp #015-2_49_101 0,0,014-3,138,87
+015-2,24,206,0 warp #015-2_24_206 0,0,015-2,122,212
+015-2,47,185,0 warp #015-2_47_185 0,0,015-2,113,183
+015-2,97,169,0 warp #015-2_97_169 0,0,015-2,68,234
+015-2,113,182,0 warp #015-2_113_182 0,0,015-2,47,184
+015-2,122,211,0 warp #015-2_122_211 0,0,015-2,24,205
+015-2,68,235,0 warp #015-2_68_235 0,0,015-2,97,168
+015-2,251,278,0 warp #015-2_251_278 0,0,015-2,94,266
+015-2,266,182,0 warp #015-2_266_182 0,0,015-2,249,233
+015-2,174,256,0 warp #015-2_174_256 0,0,015-2,264,237
+015-2,264,236,0 warp #015-2_264_236 0,0,015-2,174,255
+015-2,249,232,0 warp #015-2_249_232 0,0,015-2,266,181
diff --git a/npc/_import.txt b/npc/_import.txt
index ecc85ee9a..8922e975a 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -62,6 +62,7 @@
@include "npc/014-2/_import.txt"
@include "npc/014-3/_import.txt"
@include "npc/015-1/_import.txt"
+@include "npc/015-2/_import.txt"
@include "npc/016-1/_import.txt"
@include "npc/016-6/_import.txt"
@include "npc/016-7/_import.txt"