From 01667826e3c34579f1ed634abb3add6cd5559414 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 4 Mar 2019 11:09:21 -0300 Subject: Commit Agostine Shop --- conf/map/maps.conf | 1 + db/map_index.txt | 31 ++++++++++++++++--------------- maps/re/020-6.mcache | Bin 0 -> 92 bytes npc/020-1/_warps.txt | 1 + npc/020-6/_import.txt | 3 +++ npc/020-6/_warps.txt | 3 +++ npc/_import.txt | 1 + 7 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 maps/re/020-6.mcache create mode 100644 npc/020-6/_import.txt create mode 100644 npc/020-6/_warps.txt diff --git a/conf/map/maps.conf b/conf/map/maps.conf index ab9478e99..64734ea16 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -121,6 +121,7 @@ map_list: ( "020-3", "020-4", "020-5", + "020-6", "021-1", "021-2", "021-3", diff --git a/db/map_index.txt b/db/map_index.txt index 9fbd7deab..763380451 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -118,18 +118,19 @@ 020-3 118 020-4 119 020-5 120 -021-1 121 -021-2 122 -021-3 123 -021-4 124 -022-1 125 -023-1 126 -023-2 127 -024-1 128 -boss 129 -botcheck 130 -sec_pri 131 -soren-2 132 -soren 133 -test 134 -testbg 135 +020-6 121 +021-1 122 +021-2 123 +021-3 124 +021-4 125 +022-1 126 +023-1 127 +023-2 128 +024-1 129 +boss 130 +botcheck 131 +sec_pri 132 +soren-2 133 +soren 134 +test 135 +testbg 136 diff --git a/maps/re/020-6.mcache b/maps/re/020-6.mcache new file mode 100644 index 000000000..801f801bf Binary files /dev/null and b/maps/re/020-6.mcache differ diff --git a/npc/020-1/_warps.txt b/npc/020-1/_warps.txt index 46d5d8114..c3440cd6d 100644 --- a/npc/020-1/_warps.txt +++ b/npc/020-1/_warps.txt @@ -6,3 +6,4 @@ 020-1,57,91,0 warp #020-1_57_91 0,0,020-3,20,28 020-1,70,128,0 warp #020-1_70_128 3,0,019-1,70,22 020-1,107,55,0 warp #020-1_107_55 0,0,019-2,38,55 +020-1,33,94,0 warp #020-1_33_94 0,0,020-6,30,32 diff --git a/npc/020-6/_import.txt b/npc/020-6/_import.txt new file mode 100644 index 000000000..a8c3b8990 --- /dev/null +++ b/npc/020-6/_import.txt @@ -0,0 +1,3 @@ +// Map 020-6: Nivalis Indoors +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/020-6/_warps.txt", diff --git a/npc/020-6/_warps.txt b/npc/020-6/_warps.txt new file mode 100644 index 000000000..d9dbc0875 --- /dev/null +++ b/npc/020-6/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 020-6: Nivalis Indoors warps +020-6,31,33,0 warp #020-6_31_33 1,0,020-1,33,95 diff --git a/npc/_import.txt b/npc/_import.txt index e31047c40..378e19221 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -120,6 +120,7 @@ @include "npc/020-3/_import.txt" @include "npc/020-4/_import.txt" @include "npc/020-5/_import.txt" +@include "npc/020-6/_import.txt" @include "npc/021-1/_import.txt" @include "npc/021-2/_import.txt" @include "npc/021-3/_import.txt" -- cgit v1.2.3-60-g2f50