summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/map/maps.conf2
-rw-r--r--db/map_index.txt56
-rw-r--r--maps/re/015-5.mcachebin0 -> 3327 bytes
-rw-r--r--maps/re/015-6.mcachebin0 -> 4007 bytes
-rw-r--r--npc/014-5/_warps.txt1
-rw-r--r--npc/015-5/_import.txt4
-rw-r--r--npc/015-5/_mobs.txt18
-rw-r--r--npc/015-5/_warps.txt4
-rw-r--r--npc/015-6/_import.txt4
-rw-r--r--npc/015-6/_mobs.txt66
-rw-r--r--npc/015-6/_warps.txt5
-rw-r--r--npc/_import.txt2
12 files changed, 135 insertions, 27 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index baaeed402..d5ce14e9d 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -77,6 +77,8 @@ map_list: (
"015-2",
"015-3",
"015-4",
+ "015-5",
+ "015-6",
"016-1",
"016-6",
"016-7",
diff --git a/db/map_index.txt b/db/map_index.txt
index 861819b16..532f31ecc 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -74,30 +74,32 @@
015-2 74
015-3 75
015-4 76
-016-1 77
-016-6 78
-016-7 79
-017-1 80
-017-2-1 81
-017-2 82
-017-3 83
-017-4 84
-017-5 85
-017-6 86
-018-1-1 87
-018-1 88
-018-2-1 89
-018-2 90
-018-3-1 91
-018-3 92
-018-4-1 93
-018-4-2 94
-018-4 95
-018-5 96
-boss 97
-botcheck 98
-sec_pri 99
-soren-2 100
-soren 101
-test 102
-testbg 103
+015-5 77
+015-6 78
+016-1 79
+016-6 80
+016-7 81
+017-1 82
+017-2-1 83
+017-2 84
+017-3 85
+017-4 86
+017-5 87
+017-6 88
+018-1-1 89
+018-1 90
+018-2-1 91
+018-2 92
+018-3-1 93
+018-3 94
+018-4-1 95
+018-4-2 96
+018-4 97
+018-5 98
+boss 99
+botcheck 100
+sec_pri 101
+soren-2 102
+soren 103
+test 104
+testbg 105
diff --git a/maps/re/015-5.mcache b/maps/re/015-5.mcache
new file mode 100644
index 000000000..f21cecc05
--- /dev/null
+++ b/maps/re/015-5.mcache
Binary files differ
diff --git a/maps/re/015-6.mcache b/maps/re/015-6.mcache
new file mode 100644
index 000000000..0c6755865
--- /dev/null
+++ b/maps/re/015-6.mcache
Binary files differ
diff --git a/npc/014-5/_warps.txt b/npc/014-5/_warps.txt
index 274ad4a8d..565f94bff 100644
--- a/npc/014-5/_warps.txt
+++ b/npc/014-5/_warps.txt
@@ -1,3 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 014-5: North Woodlands warps
014-5,82,229,0 warp #014-5_82_229 1,0,014-3,172,60
+014-5,86,31,0 warp #014-5_86_31 0,0,015-5,81,139
diff --git a/npc/015-5/_import.txt b/npc/015-5/_import.txt
new file mode 100644
index 000000000..310602f5d
--- /dev/null
+++ b/npc/015-5/_import.txt
@@ -0,0 +1,4 @@
+// Map 015-5: Abandoned Mines
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/015-5/_mobs.txt",
+"npc/015-5/_warps.txt",
diff --git a/npc/015-5/_mobs.txt b/npc/015-5/_mobs.txt
new file mode 100644
index 000000000..44a298447
--- /dev/null
+++ b/npc/015-5/_mobs.txt
@@ -0,0 +1,18 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-5: Abandoned Mines mobs
+015-5,353,65,9,3 monster Cave Maggot 1027,5,100000,30000
+015-5,347,45,9,3 monster Cave Maggot 1027,5,100000,30000
+015-5,317,31,9,3 monster Cave Maggot 1027,5,100000,30000
+015-5,252,39,4,8 monster Cave Maggot 1027,5,100000,30000
+015-5,268,101,8,9 monster Cave Maggot 1027,10,100000,30000
+015-5,351,81,9,3 monster Cave Maggot 1027,5,100000,30000
+015-5,293,138,8,3 monster Cave Maggot 1027,5,100000,30000
+015-5,314,78,4,8 monster Cave Maggot 1027,5,100000,30000
+015-5,287,152,8,3 monster Cave Maggot 1027,5,100000,30000
+015-5,335,117,4,8 monster Cave Maggot 1027,5,100000,30000
+015-5,235,100,4,8 monster Cave Maggot 1027,5,100000,30000
+015-5,174,138,8,9 monster Cave Maggot 1027,10,100000,30000
+015-5,93,52,8,9 monster Troll 1171,6,100000,30000
+015-5,70,106,8,9 monster Cave Maggot 1027,10,100000,30000
+015-5,214,100,189,95 monster Cave Maggot 1027,160,70000,30000
+015-5,206,167,175,36 monster Mineral Bif 1058,6,100000,30000
diff --git a/npc/015-5/_warps.txt b/npc/015-5/_warps.txt
new file mode 100644
index 000000000..a54dbeaf7
--- /dev/null
+++ b/npc/015-5/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-5: Abandoned Mines warps
+015-5,81,138,0 warp #015-5_81_138 0,0,014-5,86,32
+015-5,353,61,0 warp #015-5_353_61 0,0,012-4,193,57
diff --git a/npc/015-6/_import.txt b/npc/015-6/_import.txt
new file mode 100644
index 000000000..f87cb8bfa
--- /dev/null
+++ b/npc/015-6/_import.txt
@@ -0,0 +1,4 @@
+// Map 015-6: Terranite Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/015-6/_mobs.txt",
+"npc/015-6/_warps.txt",
diff --git a/npc/015-6/_mobs.txt b/npc/015-6/_mobs.txt
new file mode 100644
index 000000000..ee9056279
--- /dev/null
+++ b/npc/015-6/_mobs.txt
@@ -0,0 +1,66 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-6: Terranite Cave mobs
+015-6,217,45,6,1 monster Moggun 1070,3,100000,30000
+015-6,223,30,6,1 monster Moggun 1070,3,100000,30000
+015-6,239,48,6,1 monster Moggun 1070,3,100000,30000
+015-6,197,39,3,4 monster Moggun 1070,3,100000,30000
+015-6,210,35,3,4 monster Angry Bat 1194,5,100000,30000
+015-6,241,38,3,4 monster Angry Bat 1194,5,100000,30000
+015-6,237,59,3,4 monster Angry Bat 1194,5,100000,30000
+015-6,226,73,3,4 monster Angry Bat 1194,5,100000,30000
+015-6,209,94,4,2 monster Angry Bat 1194,5,100000,30000
+015-6,263,29,3,4 monster Angry Bat 1194,5,100000,30000
+015-6,274,48,3,4 monster Angry Bat 1194,5,100000,30000
+015-6,267,70,3,4 monster Angry Bat 1194,5,100000,30000
+015-6,259,79,3,4 monster Angry Bat 1194,15,100000,30000
+015-6,274,79,3,4 monster Angry Bat 1194,5,100000,30000
+015-6,268,91,12,7 monster Moggun 1070,10,100000,30000
+015-6,209,146,34,27 monster Wicked Mushroom 1176,5,100000,30000
+015-6,254,163,9,23 monster Angry Yellow Slime 1198,10,100000,30000
+015-6,167,175,8,11 monster Angry Yellow Slime 1198,10,100000,30000
+015-6,148,176,8,11 monster Red Slime 1092,15,100000,30000
+015-6,131,88,8,11 monster Red Slime 1092,1039,100000,30000
+015-6,140,131,8,11 monster Angry Yellow Slime 1198,10,100000,30000
+015-6,42,128,8,4 monster Angry Yellow Slime 1198,10,100000,30000
+015-6,64,62,12,15 monster Wicked Mushroom 1176,12,100000,30000
+015-6,69,89,8,10 monster Angry Yellow Slime 1198,10,100000,30000
+015-6,34,45,8,16 monster Terranite 1167,3,100000,30000
+015-6,64,36,12,8 monster Cave Maggot 1027,3,100000,30000
+015-6,100,115,12,8 monster Cave Maggot 1027,3,100000,30000
+015-6,90,137,8,11 monster Angry Yellow Slime 1198,10,100000,30000
+015-6,59,113,7,8 monster Cave Maggot 1027,28,100000,30000
+015-6,42,176,7,6 monster Terranite 1167,3,100000,30000
+015-6,120,177,12,8 monster Cave Maggot 1027,3,100000,30000
+015-6,287,180,12,8 monster Cave Maggot 1027,3,100000,30000
+015-6,340,175,12,8 monster Cave Maggot 1027,3,100000,30000
+015-6,390,156,34,27 monster Wicked Mushroom 1176,15,100000,30000
+015-6,358,37,10,11 monster Terranite 1167,3,100000,30000
+015-6,481,110,9,12 monster Terranite 1167,3,100000,30000
+015-6,435,114,12,8 monster Cave Maggot 1027,3,100000,30000
+015-6,477,82,12,8 monster Cave Maggot 1027,3,100000,30000
+015-6,354,106,9,23 monster Angry Yellow Slime 1198,10,100000,30000
+015-6,342,139,8,11 monster Red Slime 1092,10,100000,30000
+015-6,389,81,16,7 monster Red Slime 1092,16,100000,30000
+015-6,409,35,3,4 monster Angry Bat 1194,11,100000,30000
+015-6,413,73,3,4 monster Angry Bat 1194,11,100000,30000
+015-6,395,63,3,4 monster Angry Bat 1194,11,100000,30000
+015-6,314,182,3,4 monster Angry Bat 1194,5,100000,30000
+015-6,409,121,3,4 monster Angry Bat 1194,18,100000,30000
+015-6,456,99,3,4 monster Angry Bat 1194,11,100000,30000
+015-6,133,153,4,2 monster Angry Bat 1194,11,100000,30000
+015-6,153,98,4,2 monster Angry Bat 1194,5,100000,30000
+015-6,126,65,4,2 monster Angry Bat 1194,5,100000,30000
+015-6,81,180,4,2 monster Angry Bat 1194,5,100000,30000
+015-6,61,159,4,2 monster Angry Bat 1194,5,100000,30000
+015-6,271,157,3,4 monster Angry Bat 1194,5,100000,30000
+015-6,270,182,3,4 monster Angry Bat 1194,5,100000,30000
+015-6,322,141,8,11 monster Red Slime 1092,10,100000,30000
+015-6,451,111,3,4 monster Angry Bat 1194,5,100000,30000
+015-6,422,50,5,16 monster Wicked Mushroom 1176,10,100000,30000
+015-6,380,40,7,11 monster Wicked Mushroom 1176,10,100000,30000
+015-6,124,49,4,12 monster Terranite 1167,1,100000,30000
+015-6,80,110,4,2 monster Angry Bat 1194,5,100000,30000
+015-6,42,142,10,5 monster Cave Maggot 1027,3,100000,30000
+015-6,41,159,5,10 monster Wicked Mushroom 1176,8,100000,30000
+015-6,95,180,4,2 monster Angry Bat 1194,5,100000,30000
+015-6,91,180,11,5 monster Wicked Mushroom 1176,15,100000,30000
diff --git a/npc/015-6/_warps.txt b/npc/015-6/_warps.txt
new file mode 100644
index 000000000..6aba50637
--- /dev/null
+++ b/npc/015-6/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 015-6: Terranite Cave warps
+015-6,193,58,0 warp #015-6_193_58 0,0,015-5,353,62
+015-6,363,26,0 warp #015-6_363_26 0,0,015-6,474,187
+015-6,474,188,0 warp #015-6_474_188 0,0,015-6,363,27
diff --git a/npc/_import.txt b/npc/_import.txt
index aca63f202..55c90fc8e 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -76,6 +76,8 @@
@include "npc/015-2/_import.txt"
@include "npc/015-3/_import.txt"
@include "npc/015-4/_import.txt"
+@include "npc/015-5/_import.txt"
+@include "npc/015-6/_import.txt"
@include "npc/016-1/_import.txt"
@include "npc/016-6/_import.txt"
@include "npc/016-7/_import.txt"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-08 02:22:38 +0000