diff options
-rw-r--r-- | conf/map/maps.conf | 1 | ||||
-rw-r--r-- | db/map_index.txt | 15 | ||||
-rw-r--r-- | maps/re/014-1.mcache | bin | 993 -> 996 bytes | |||
-rw-r--r-- | maps/re/015-1.mcache | bin | 0 -> 1635 bytes | |||
-rw-r--r-- | npc/014-1/_import.txt | 1 | ||||
-rw-r--r-- | npc/014-1/_mobs.txt | 4 | ||||
-rw-r--r-- | npc/014-1/_warps.txt | 3 | ||||
-rw-r--r-- | npc/015-1/_import.txt | 4 | ||||
-rw-r--r-- | npc/015-1/_mobs.txt | 6 | ||||
-rw-r--r-- | npc/015-1/_warps.txt | 3 | ||||
-rw-r--r-- | npc/_import.txt | 1 |
11 files changed, 30 insertions, 8 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 140f92c5d..011dc2d27 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -50,6 +50,7 @@ map_list: ( "012-2", "012-3", "014-1", + "015-1", "boss", "botcheck", "sec_pri", diff --git a/db/map_index.txt b/db/map_index.txt index ad82a018b..fedcf2166 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -47,10 +47,11 @@ 012-2 47 012-3 48 014-1 49 -boss 50 -botcheck 51 -sec_pri 52 -soren-2 53 -soren 54 -test 55 -testbg 56 +015-1 50 +boss 51 +botcheck 52 +sec_pri 53 +soren-2 54 +soren 55 +test 56 +testbg 57 diff --git a/maps/re/014-1.mcache b/maps/re/014-1.mcache Binary files differindex 2b523f899..7b8d159d1 100644 --- a/maps/re/014-1.mcache +++ b/maps/re/014-1.mcache diff --git a/maps/re/015-1.mcache b/maps/re/015-1.mcache Binary files differnew file mode 100644 index 000000000..3bc52f01f --- /dev/null +++ b/maps/re/015-1.mcache diff --git a/npc/014-1/_import.txt b/npc/014-1/_import.txt index e33767915..a036c39cc 100644 --- a/npc/014-1/_import.txt +++ b/npc/014-1/_import.txt @@ -1,3 +1,4 @@ // Map 014-1: Woodland Mining Camp // This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/014-1/_mobs.txt", "npc/014-1/_warps.txt", diff --git a/npc/014-1/_mobs.txt b/npc/014-1/_mobs.txt new file mode 100644 index 000000000..8de224201 --- /dev/null +++ b/npc/014-1/_mobs.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 014-1: Woodland Mining Camp mobs +014-1,97,59,86,45 monster Silk Worm 1034,15,30000,30000 +014-1,97,67,50,45 monster Mouboo 1023,12,30000,45000 diff --git a/npc/014-1/_warps.txt b/npc/014-1/_warps.txt index 332df5e07..d77a98243 100644 --- a/npc/014-1/_warps.txt +++ b/npc/014-1/_warps.txt @@ -1,3 +1,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 014-1: Woodland Mining Camp warps -014-1,79,98,0 warp #014-1_79_98 3,0,008-1,78,18 +014-1,79,98,0 warp #014-1_79_98 3,0,012-1,78,18 +014-1,79,57,0 warp #014-1_79_57 1,0,015-1,99,132 diff --git a/npc/015-1/_import.txt b/npc/015-1/_import.txt new file mode 100644 index 000000000..b247616e1 --- /dev/null +++ b/npc/015-1/_import.txt @@ -0,0 +1,4 @@ +// Map 015-1: Woodland Mines +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/015-1/_mobs.txt", +"npc/015-1/_warps.txt", diff --git a/npc/015-1/_mobs.txt b/npc/015-1/_mobs.txt new file mode 100644 index 000000000..560547c50 --- /dev/null +++ b/npc/015-1/_mobs.txt @@ -0,0 +1,6 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 015-1: Woodland Mines mobs +015-1,79,83,119,97 monster Silk Worm 1034,5,30000,30000 +015-1,121,105,119,97 monster Bif 1058,8,45000,45000 +015-1,73,111,119,97 monster Red Slime 1092,60,30000,30000 +015-1,130,81,119,97 monster Cave Bat 1039,40,60000,60000 diff --git a/npc/015-1/_warps.txt b/npc/015-1/_warps.txt new file mode 100644 index 000000000..ca874567c --- /dev/null +++ b/npc/015-1/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 015-1: Woodland Mines warps +015-1,100,133,0 warp #015-1_100_133 1,0,014-1,79,58 diff --git a/npc/_import.txt b/npc/_import.txt index ee559d49a..712a6ac23 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -49,6 +49,7 @@ @include "npc/012-2/_import.txt" @include "npc/012-3/_import.txt" @include "npc/014-1/_import.txt" +@include "npc/015-1/_import.txt" @include "npc/boss/_import.txt" @include "npc/botcheck/_import.txt" @include "npc/sec_pri/_import.txt" |