diff options
-rw-r--r-- | conf/map/maps.conf | 1 | ||||
-rw-r--r-- | db/map_index.txt | 63 | ||||
-rw-r--r-- | maps/re/020-7-1.mcache | bin | 386 -> 394 bytes | |||
-rw-r--r-- | maps/re/020-7-2.mcache | bin | 0 -> 594 bytes | |||
-rw-r--r-- | npc/020-7-1/_warps.txt | 2 | ||||
-rw-r--r-- | npc/020-7-2/_import.txt | 2 | ||||
-rw-r--r-- | npc/020-7/_warps.txt | 2 | ||||
-rw-r--r-- | npc/_import.txt | 1 |
8 files changed, 38 insertions, 33 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index a047b8f15..23113cd3e 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -136,6 +136,7 @@ map_list: ( "020-5", "020-6", "020-7-1", + "020-7-2", "020-7", "021-1", "021-2", diff --git a/db/map_index.txt b/db/map_index.txt index 2bbceb10b..67da6753e 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -133,34 +133,35 @@ 020-5 133 020-6 134 020-7-1 135 -020-7 136 -021-1 137 -021-2 138 -021-3 139 -021-4 140 -022-1 141 -023-1 142 -023-2 143 -024-1 144 -024-10 145 -024-11 146 -024-12 147 -024-13 148 -024-14 149 -024-15 150 -024-2 151 -024-3 152 -024-4 153 -024-5 154 -024-6 155 -024-7 156 -024-8 157 -024-9 158 -boss 159 -botcheck 160 -guilds 161 -sec_pri 162 -soren-2 163 -soren 164 -test 165 -testbg 166 +020-7-2 136 +020-7 137 +021-1 138 +021-2 139 +021-3 140 +021-4 141 +022-1 142 +023-1 143 +023-2 144 +024-1 145 +024-10 146 +024-11 147 +024-12 148 +024-13 149 +024-14 150 +024-15 151 +024-2 152 +024-3 153 +024-4 154 +024-5 155 +024-6 156 +024-7 157 +024-8 158 +024-9 159 +boss 160 +botcheck 161 +guilds 162 +sec_pri 163 +soren-2 164 +soren 165 +test 166 +testbg 167 diff --git a/maps/re/020-7-1.mcache b/maps/re/020-7-1.mcache Binary files differindex 7a160bd37..d20e68145 100644 --- a/maps/re/020-7-1.mcache +++ b/maps/re/020-7-1.mcache diff --git a/maps/re/020-7-2.mcache b/maps/re/020-7-2.mcache Binary files differnew file mode 100644 index 000000000..27a1ec7bf --- /dev/null +++ b/maps/re/020-7-2.mcache diff --git a/npc/020-7-1/_warps.txt b/npc/020-7-1/_warps.txt index fb35ff2f9..4db1e29f3 100644 --- a/npc/020-7-1/_warps.txt +++ b/npc/020-7-1/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 020-7-1: Blue Sages' Mansion warps -020-7-1,23,30,0 warp #020-7-1_23_30 0,1,020-7,55,22 +020-7-1,24,85,0 warp #020-7-1_24_85 2,0,020-7,55,22 diff --git a/npc/020-7-2/_import.txt b/npc/020-7-2/_import.txt new file mode 100644 index 000000000..07e8e6dec --- /dev/null +++ b/npc/020-7-2/_import.txt @@ -0,0 +1,2 @@ +// Map 020-7-2: Ice cave +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/020-7/_warps.txt b/npc/020-7/_warps.txt index e276b9bff..4a9805b3f 100644 --- a/npc/020-7/_warps.txt +++ b/npc/020-7/_warps.txt @@ -1,4 +1,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 020-7: Blue Sages' Mansion warps -020-7,56,21,0 warp #020-7_56_21 1,0,020-7-1,25,30 +020-7,56,21,0 warp #020-7_56_21 1,0,020-7-1,24,84 020-7,40,50,0 warp #020-7_40_50 0,0,020-1,66,53 diff --git a/npc/_import.txt b/npc/_import.txt index 60c7b0381..959b7a3a3 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -135,6 +135,7 @@ @include "npc/020-5/_import.txt" @include "npc/020-6/_import.txt" @include "npc/020-7-1/_import.txt" +@include "npc/020-7-2/_import.txt" @include "npc/020-7/_import.txt" @include "npc/021-1/_import.txt" @include "npc/021-2/_import.txt" |