diff options
-rw-r--r-- | conf/map/maps.conf | 1 | ||||
-rw-r--r-- | db/map_index.txt | 21 | ||||
-rw-r--r-- | maps/re/012-7.mcache | bin | 0 -> 112 bytes | |||
-rw-r--r-- | npc/012-1/_warps.txt | 1 | ||||
-rw-r--r-- | npc/012-7/_import.txt | 3 | ||||
-rw-r--r-- | npc/012-7/_warps.txt | 3 | ||||
-rw-r--r-- | npc/_import.txt | 1 |
7 files changed, 20 insertions, 10 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index d995d5475..99b2eb8b9 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -54,6 +54,7 @@ map_list: ( "012-4", "012-5", "012-6", + "012-7", "014-1", "014-2", "015-1", diff --git a/db/map_index.txt b/db/map_index.txt index 4d886e8be..baaa2c42c 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -51,13 +51,14 @@ 012-4 51 012-5 52 012-6 53 -014-1 54 -014-2 55 -015-1 56 -boss 57 -botcheck 58 -sec_pri 59 -soren-2 60 -soren 61 -test 62 -testbg 63 +012-7 54 +014-1 55 +014-2 56 +015-1 57 +boss 58 +botcheck 59 +sec_pri 60 +soren-2 61 +soren 62 +test 63 +testbg 64 diff --git a/maps/re/012-7.mcache b/maps/re/012-7.mcache Binary files differnew file mode 100644 index 000000000..cf55f653d --- /dev/null +++ b/maps/re/012-7.mcache diff --git a/npc/012-1/_warps.txt b/npc/012-1/_warps.txt index b9d0e17be..34ddb165f 100644 --- a/npc/012-1/_warps.txt +++ b/npc/012-1/_warps.txt @@ -9,3 +9,4 @@ 012-1,121,71,0 warp #012-1_121_71 0,0,012-5,34,36 012-1,116,66,0 warp #012-1_116_66 0,0,012-5,23,26 012-1,110,56,0 warp #012-1_110_56 0,0,012-6,58,68 +012-1,102,69,0 warp #012-1_102_69 0,0,012-7,35,64 diff --git a/npc/012-7/_import.txt b/npc/012-7/_import.txt new file mode 100644 index 000000000..1f927ce5f --- /dev/null +++ b/npc/012-7/_import.txt @@ -0,0 +1,3 @@ +// Map 012-7: Town Hall +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/012-7/_warps.txt", diff --git a/npc/012-7/_warps.txt b/npc/012-7/_warps.txt new file mode 100644 index 000000000..7cc2e52e1 --- /dev/null +++ b/npc/012-7/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 012-7: Town Hall warps +012-7,35,65,0 warp #012-7_35_65 0,0,012-1,102,70 diff --git a/npc/_import.txt b/npc/_import.txt index 766deab92..4e7fa6cb5 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -53,6 +53,7 @@ @include "npc/012-4/_import.txt" @include "npc/012-5/_import.txt" @include "npc/012-6/_import.txt" +@include "npc/012-7/_import.txt" @include "npc/014-1/_import.txt" @include "npc/014-2/_import.txt" @include "npc/015-1/_import.txt" |