diff options
| -rw-r--r-- | conf/map/maps.conf | 1 | ||||
| -rw-r--r-- | db/map_index.txt | 35 | ||||
| -rw-r--r-- | maps/re/017-1.mcache | bin | 4344 -> 4346 bytes | |||
| -rw-r--r-- | maps/re/017-6.mcache | bin | 0 -> 120 bytes | |||
| -rw-r--r-- | npc/017-1/_warps.txt | 3 | ||||
| -rw-r--r-- | npc/017-6/_import.txt | 3 | ||||
| -rw-r--r-- | npc/017-6/_warps.txt | 5 | ||||
| -rw-r--r-- | npc/_import.txt | 1 |
8 files changed, 31 insertions, 17 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index b372367a2..1823bb78d 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -84,6 +84,7 @@ map_list: ( "017-3", "017-4", "017-5", + "017-6", "018-1-1", "018-1", "018-2-1", diff --git a/db/map_index.txt b/db/map_index.txt index dec891b03..0378d0349 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -81,20 +81,21 @@ 017-3 81 017-4 82 017-5 83 -018-1-1 84 -018-1 85 -018-2-1 86 -018-2 87 -018-3-1 88 -018-3 89 -018-4-1 90 -018-4-2 91 -018-4 92 -018-5 93 -boss 94 -botcheck 95 -sec_pri 96 -soren-2 97 -soren 98 -test 99 -testbg 100 +017-6 84 +018-1-1 85 +018-1 86 +018-2-1 87 +018-2 88 +018-3-1 89 +018-3 90 +018-4-1 91 +018-4-2 92 +018-4 93 +018-5 94 +boss 95 +botcheck 96 +sec_pri 97 +soren-2 98 +soren 99 +test 100 +testbg 101 diff --git a/maps/re/017-1.mcache b/maps/re/017-1.mcache Binary files differindex 0d8c92f7a..62979efe3 100644 --- a/maps/re/017-1.mcache +++ b/maps/re/017-1.mcache diff --git a/maps/re/017-6.mcache b/maps/re/017-6.mcache Binary files differnew file mode 100644 index 000000000..ea2f270ca --- /dev/null +++ b/maps/re/017-6.mcache diff --git a/npc/017-1/_warps.txt b/npc/017-1/_warps.txt index 85b8bd8e4..88b6bdbbb 100644 --- a/npc/017-1/_warps.txt +++ b/npc/017-1/_warps.txt @@ -8,3 +8,6 @@ 017-1,150,87,0 warp #017-1_150_87 0,0,017-4,27,41 017-1,155,87,0 warp #017-1_155_87 0,0,017-4,35,41 017-1,133,155,0 warp #017-1_133_155 0,0,017-5,23,33 +017-1,37,140,0 warp #017-1_37_140 0,1,017-6,29,43 +017-1,37,155,0 warp #017-1_37_155 0,1,017-6,29,52 +017-1,37,132,0 warp #017-1_37_132 0,1,017-6,29,31 diff --git a/npc/017-6/_import.txt b/npc/017-6/_import.txt new file mode 100644 index 000000000..1f76d9801 --- /dev/null +++ b/npc/017-6/_import.txt @@ -0,0 +1,3 @@ +// Map 017-6: LoF Alchemy Shop +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/017-6/_warps.txt", diff --git a/npc/017-6/_warps.txt b/npc/017-6/_warps.txt new file mode 100644 index 000000000..5d600c767 --- /dev/null +++ b/npc/017-6/_warps.txt @@ -0,0 +1,5 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 017-6: LoF Alchemy Shop warps +017-6,30,44,0 warp #017-6_30_44 0,1,017-1,38,139 +017-6,30,32,0 warp #017-6_30_32 0,1,017-1,38,131 +017-6,30,53,0 warp #017-6_30_53 0,1,017-1,38,154 diff --git a/npc/_import.txt b/npc/_import.txt index a9f03c872..a9e60f81d 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -83,6 +83,7 @@ @include "npc/017-3/_import.txt" @include "npc/017-4/_import.txt" @include "npc/017-5/_import.txt" +@include "npc/017-6/_import.txt" @include "npc/018-1-1/_import.txt" @include "npc/018-1/_import.txt" @include "npc/018-2-1/_import.txt" |