From 35fc364a6b7d33a17a4fce7eaca5bc49fa7b8746 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 25 May 2021 01:02:24 -0300 Subject: Acknowledge Piou's Castle, renegerating map data. --- conf/map/maps.conf | 3 + db/map_index.txt | 393 ++++++++++++++++++++++++------------------------ maps/re/006-2-2.mcache | Bin 112 -> 102 bytes maps/re/006-2-3.mcache | Bin 212 -> 206 bytes maps/re/006-2-4.mcache | Bin 0 -> 74 bytes maps/re/006-2-5.mcache | Bin 0 -> 92 bytes maps/re/006-2-6.mcache | Bin 0 -> 97 bytes npc/006-2-2/_warps.txt | 2 +- npc/006-2-3/_mobs.txt | 8 +- npc/006-2-3/_warps.txt | 4 +- npc/006-2-4/_import.txt | 4 + npc/006-2-4/_mobs.txt | 3 + npc/006-2-4/_warps.txt | 3 + npc/006-2-5/_import.txt | 4 + npc/006-2-5/_mobs.txt | 4 + npc/006-2-5/_warps.txt | 5 + npc/006-2-6/_import.txt | 4 + npc/006-2-6/_mobs.txt | 4 + npc/006-2-6/_warps.txt | 3 + npc/006-2/_warps.txt | 1 + npc/_import.txt | 3 + 21 files changed, 246 insertions(+), 202 deletions(-) create mode 100644 maps/re/006-2-4.mcache create mode 100644 maps/re/006-2-5.mcache create mode 100644 maps/re/006-2-6.mcache create mode 100644 npc/006-2-4/_import.txt create mode 100644 npc/006-2-4/_mobs.txt create mode 100644 npc/006-2-4/_warps.txt create mode 100644 npc/006-2-5/_import.txt create mode 100644 npc/006-2-5/_mobs.txt create mode 100644 npc/006-2-5/_warps.txt create mode 100644 npc/006-2-6/_import.txt create mode 100644 npc/006-2-6/_mobs.txt create mode 100644 npc/006-2-6/_warps.txt diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 18d7c6c7b..0b6f710bc 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -61,6 +61,9 @@ map_list: ( "006-2-1", "006-2-2", "006-2-3", + "006-2-4", + "006-2-5", + "006-2-6", "006-2", "006-3", "006-4-1", diff --git a/db/map_index.txt b/db/map_index.txt index 57250f993..154e3a6b1 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -58,198 +58,201 @@ 006-2-1 58 006-2-2 59 006-2-3 60 -006-2 61 -006-3 62 -006-4-1 63 -006-4 64 -006-5 65 -007-1 66 -007-2 67 -008-0 68 -008-1 69 -008-2 70 -009-1 71 -009-2 72 -009-3 73 -009-4 74 -009-5 75 -009-6 76 -009-7 77 -010-1-1 78 -010-1 79 -010-2 80 -011-1 81 -011-2 82 -011-3 83 -012-1 84 -012-2 85 -012-3 86 -012-4 87 -012-5 88 -012-6 89 -012-7 90 -012-8 91 -013-1 92 -014-1 93 -014-2-1 94 -014-2 95 -014-3 96 -014-4 97 -014-5-1 98 -014-5 99 -015-1 100 -015-2 101 -015-3 102 -015-4 103 -015-5 104 -015-6 105 -015-7 106 -015-8-1 107 -015-8 108 -016-1 109 -016-6 110 -016-7 111 -017-0 112 -017-1 113 -017-10 114 -017-2-1 115 -017-2-2 116 -017-2 117 -017-3 118 -017-4 119 -017-5 120 -017-6 121 -017-7 122 -017-8 123 -018-1-1 124 -018-1 125 -018-2-1 126 -018-2-2 127 -018-2-3 128 -018-2-4 129 -018-2-5 130 -018-2-6 131 -018-2-7 132 -018-2-8 133 -018-2 134 -018-3 135 -018-4-1 136 -018-4-2 137 -018-4 138 -018-5-0 139 -018-5-1 140 -018-5-2 141 -018-5-3 142 -018-5-4 143 -018-5-5 144 -018-5-boss 145 -018-5 146 -018-6-0 147 -018-6-1 148 -018-6-2 149 -018-6-3 150 -018-7-1 151 -018-7 152 -019-1-1 153 -019-1 154 -019-2 155 -019-3 156 -019-4-1 157 -019-4 158 -020-1 159 -020-2 160 -020-3 161 -020-4 162 -020-5 163 -020-6 164 -020-7-1 165 -020-7-2 166 -020-7 167 -021-0 168 -021-1 169 -021-2 170 -021-3 171 -021-4 172 -022-1 173 -023-1 174 -023-2 175 -023-3-1 176 -023-3-2 177 -023-3 178 -024-1 179 -024-10 180 -024-11 181 -024-12 182 -024-13 183 -024-14 184 -024-15 185 -024-16 186 -024-2 187 -024-3 188 -024-4 189 -024-5 190 -024-6 191 -024-7 192 -024-8 193 -024-9 194 -025-1 195 -025-2-1 196 -025-2-2 197 -025-2-3 198 -025-2-4 199 -025-2 200 -025-3 201 -026-0 202 -026-1 203 -026-2 204 -027-0 205 -027-1 206 -027-2 207 -027-3 208 -027-4 209 -029-0 210 -029-1 211 -029-2 212 -029-3 213 -029-4 214 -029-5 215 -029-6 216 -029-7 217 -029-8 218 -029-9 219 -042-0 220 -042-1 221 -042-10 222 -042-11 223 -042-2 224 -042-3 225 -042-4 226 -042-5 227 -042-6 228 -042-7 229 -042-8 230 -042-9 231 -boss 232 -botcheck 233 -guilds 234 -maze0 235 -maze1 236 -maze10 237 -maze11 238 -maze12 239 -maze13 240 -maze14 241 -maze15 242 -maze2 243 -maze3 244 -maze4 245 -maze5 246 -maze6 247 -maze7 248 -maze8 249 -maze9 250 -sec_pri 251 -soren-2 252 -soren 253 -test 254 -testbg 255 +006-2-4 61 +006-2-5 62 +006-2-6 63 +006-2 64 +006-3 65 +006-4-1 66 +006-4 67 +006-5 68 +007-1 69 +007-2 70 +008-0 71 +008-1 72 +008-2 73 +009-1 74 +009-2 75 +009-3 76 +009-4 77 +009-5 78 +009-6 79 +009-7 80 +010-1-1 81 +010-1 82 +010-2 83 +011-1 84 +011-2 85 +011-3 86 +012-1 87 +012-2 88 +012-3 89 +012-4 90 +012-5 91 +012-6 92 +012-7 93 +012-8 94 +013-1 95 +014-1 96 +014-2-1 97 +014-2 98 +014-3 99 +014-4 100 +014-5-1 101 +014-5 102 +015-1 103 +015-2 104 +015-3 105 +015-4 106 +015-5 107 +015-6 108 +015-7 109 +015-8-1 110 +015-8 111 +016-1 112 +016-6 113 +016-7 114 +017-0 115 +017-1 116 +017-10 117 +017-2-1 118 +017-2-2 119 +017-2 120 +017-3 121 +017-4 122 +017-5 123 +017-6 124 +017-7 125 +017-8 126 +018-1-1 127 +018-1 128 +018-2-1 129 +018-2-2 130 +018-2-3 131 +018-2-4 132 +018-2-5 133 +018-2-6 134 +018-2-7 135 +018-2-8 136 +018-2 137 +018-3 138 +018-4-1 139 +018-4-2 140 +018-4 141 +018-5-0 142 +018-5-1 143 +018-5-2 144 +018-5-3 145 +018-5-4 146 +018-5-5 147 +018-5-boss 148 +018-5 149 +018-6-0 150 +018-6-1 151 +018-6-2 152 +018-6-3 153 +018-7-1 154 +018-7 155 +019-1-1 156 +019-1 157 +019-2 158 +019-3 159 +019-4-1 160 +019-4 161 +020-1 162 +020-2 163 +020-3 164 +020-4 165 +020-5 166 +020-6 167 +020-7-1 168 +020-7-2 169 +020-7 170 +021-0 171 +021-1 172 +021-2 173 +021-3 174 +021-4 175 +022-1 176 +023-1 177 +023-2 178 +023-3-1 179 +023-3-2 180 +023-3 181 +024-1 182 +024-10 183 +024-11 184 +024-12 185 +024-13 186 +024-14 187 +024-15 188 +024-16 189 +024-2 190 +024-3 191 +024-4 192 +024-5 193 +024-6 194 +024-7 195 +024-8 196 +024-9 197 +025-1 198 +025-2-1 199 +025-2-2 200 +025-2-3 201 +025-2-4 202 +025-2 203 +025-3 204 +026-0 205 +026-1 206 +026-2 207 +027-0 208 +027-1 209 +027-2 210 +027-3 211 +027-4 212 +029-0 213 +029-1 214 +029-2 215 +029-3 216 +029-4 217 +029-5 218 +029-6 219 +029-7 220 +029-8 221 +029-9 222 +042-0 223 +042-1 224 +042-10 225 +042-11 226 +042-2 227 +042-3 228 +042-4 229 +042-5 230 +042-6 231 +042-7 232 +042-8 233 +042-9 234 +boss 235 +botcheck 236 +guilds 237 +maze0 238 +maze1 239 +maze10 240 +maze11 241 +maze12 242 +maze13 243 +maze14 244 +maze15 245 +maze2 246 +maze3 247 +maze4 248 +maze5 249 +maze6 250 +maze7 251 +maze8 252 +maze9 253 +sec_pri 254 +soren-2 255 +soren 256 +test 257 +testbg 258 diff --git a/maps/re/006-2-2.mcache b/maps/re/006-2-2.mcache index bb3e52d4f..654dffed0 100644 Binary files a/maps/re/006-2-2.mcache and b/maps/re/006-2-2.mcache differ diff --git a/maps/re/006-2-3.mcache b/maps/re/006-2-3.mcache index aab409dbb..4e06a701d 100644 Binary files a/maps/re/006-2-3.mcache and b/maps/re/006-2-3.mcache differ diff --git a/maps/re/006-2-4.mcache b/maps/re/006-2-4.mcache new file mode 100644 index 000000000..c22b21563 Binary files /dev/null and b/maps/re/006-2-4.mcache differ diff --git a/maps/re/006-2-5.mcache b/maps/re/006-2-5.mcache new file mode 100644 index 000000000..67a641566 Binary files /dev/null and b/maps/re/006-2-5.mcache differ diff --git a/maps/re/006-2-6.mcache b/maps/re/006-2-6.mcache new file mode 100644 index 000000000..61c2a732d Binary files /dev/null and b/maps/re/006-2-6.mcache differ diff --git a/npc/006-2-2/_warps.txt b/npc/006-2-2/_warps.txt index 13697d056..4c7ce1358 100644 --- a/npc/006-2-2/_warps.txt +++ b/npc/006-2-2/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 006-2-2: Secret Cave warps -006-2-2,36,52,0 warp #006-2-2_36_52 0,0,006-2,71,87 +006-2-2,35,48,0 warp #006-2-2_35_48 1,0,006-2,71,87 diff --git a/npc/006-2-3/_mobs.txt b/npc/006-2-3/_mobs.txt index 54f7b9dcb..29db02808 100644 --- a/npc/006-2-3/_mobs.txt +++ b/npc/006-2-3/_mobs.txt @@ -1,6 +1,6 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 006-2-3: Mushroom Cavern mobs -006-2-3,41,42,15,13 monster Piou 1002,6,30000,30000 -006-2-3,40,40,8,7 monster Silk Worm 1034,6,30000,30000 -006-2-3,46,42,6,10 monster Red Butterfly 1025,2,30000,30000 -006-2-3,36,42,6,10 monster Cyan Butterfly 1172,2,30000,30000 +006-2-3,44,34,14,13 monster Piou 1002,6,30000,30000 +006-2-3,43,32,8,7 monster Silk Worm 1034,6,30000,30000 +006-2-3,49,34,6,10 monster Red Butterfly 1025,2,30000,30000 +006-2-3,39,34,6,10 monster Cyan Butterfly 1172,2,30000,30000 diff --git a/npc/006-2-3/_warps.txt b/npc/006-2-3/_warps.txt index 198934da4..e0052f70f 100644 --- a/npc/006-2-3/_warps.txt +++ b/npc/006-2-3/_warps.txt @@ -1,4 +1,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 006-2-3: Mushroom Cavern warps -006-2-3,41,28,0 warp #006-2-3_41_28 0,0,006-2,62,109 -006-2-3,41,56,0 warp #006-2-3_41_56 0,0,006-2,68,114 +006-2-3,44,20,0 warp #006-2-3_44_20 0,0,006-2,62,109 +006-2-3,44,48,0 warp #006-2-3_44_48 0,0,006-2,68,114 diff --git a/npc/006-2-4/_import.txt b/npc/006-2-4/_import.txt new file mode 100644 index 000000000..516cd26f3 --- /dev/null +++ b/npc/006-2-4/_import.txt @@ -0,0 +1,4 @@ +// Map 006-2-4: Training Room +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/006-2-4/_mobs.txt", +"npc/006-2-4/_warps.txt", diff --git a/npc/006-2-4/_mobs.txt b/npc/006-2-4/_mobs.txt new file mode 100644 index 000000000..760f2ad3a --- /dev/null +++ b/npc/006-2-4/_mobs.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 006-2-4: Training Room mobs +006-2-4,35,27,3,2 monster Piou Knight 1434,2,30000,30000 diff --git a/npc/006-2-4/_warps.txt b/npc/006-2-4/_warps.txt new file mode 100644 index 000000000..dac54f44e --- /dev/null +++ b/npc/006-2-4/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 006-2-4: Training Room warps +006-2-4,39,22,0 warp #006-2-4_39_22 0,0,006-2-5,43,24 diff --git a/npc/006-2-5/_import.txt b/npc/006-2-5/_import.txt new file mode 100644 index 000000000..7a07b21fb --- /dev/null +++ b/npc/006-2-5/_import.txt @@ -0,0 +1,4 @@ +// Map 006-2-5: Throne Room +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/006-2-5/_mobs.txt", +"npc/006-2-5/_warps.txt", diff --git a/npc/006-2-5/_mobs.txt b/npc/006-2-5/_mobs.txt new file mode 100644 index 000000000..86c6e3550 --- /dev/null +++ b/npc/006-2-5/_mobs.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 006-2-5: Throne Room mobs +006-2-5,34,28,1,1 monster Forest Piou 1202,2,30000,30000 +006-2-5,42,28,1,1 monster Mana Piou 1155,2,30000,30000 diff --git a/npc/006-2-5/_warps.txt b/npc/006-2-5/_warps.txt new file mode 100644 index 000000000..6f2842d15 --- /dev/null +++ b/npc/006-2-5/_warps.txt @@ -0,0 +1,5 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 006-2-5: Throne Room warps +006-2-5,38,35,0 warp #006-2-5_38_35 0,0,006-2,68,75 +006-2-5,34,21,0 warp #006-2-5_34_21 0,0,006-2-4,33,23 +006-2-5,43,23,0 warp #006-2-5_43_23 0,0,006-2-4,39,23 diff --git a/npc/006-2-6/_import.txt b/npc/006-2-6/_import.txt new file mode 100644 index 000000000..2b82b5a30 --- /dev/null +++ b/npc/006-2-6/_import.txt @@ -0,0 +1,4 @@ +// Map 006-2-6: Upper Level +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/006-2-6/_mobs.txt", +"npc/006-2-6/_warps.txt", diff --git a/npc/006-2-6/_mobs.txt b/npc/006-2-6/_mobs.txt new file mode 100644 index 000000000..6eeca13f0 --- /dev/null +++ b/npc/006-2-6/_mobs.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 006-2-6: Upper Level mobs +006-2-6,35,31,1,1 monster Piou 1002,3,30000,30000 +006-2-6,41,31,1,1 monster Piousse 1003,3,30000,30000 diff --git a/npc/006-2-6/_warps.txt b/npc/006-2-6/_warps.txt new file mode 100644 index 000000000..fecd7ad81 --- /dev/null +++ b/npc/006-2-6/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 006-2-6: Upper Level warps +006-2-6,34,23,0 warp #006-2-6_34_23 0,0,006-2-4,34,22 diff --git a/npc/006-2/_warps.txt b/npc/006-2/_warps.txt index 90b67fa68..41770a969 100644 --- a/npc/006-2/_warps.txt +++ b/npc/006-2/_warps.txt @@ -7,3 +7,4 @@ 006-2,61,109,0 warp #006-2_61_109 0,0,006-2-3,42,29 006-2,68,113,0 warp #006-2_68_113 0,0,006-2-3,41,55 006-2,68,118,0 warp #006-2_68_118 0,0,006-0,40,36 +006-2,68,74,0 warp #006-2_68_74 0,0,006-2-4,38,34 diff --git a/npc/_import.txt b/npc/_import.txt index 24bbad735..15d640822 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -60,6 +60,9 @@ @include "npc/006-2-1/_import.txt" @include "npc/006-2-2/_import.txt" @include "npc/006-2-3/_import.txt" +@include "npc/006-2-4/_import.txt" +@include "npc/006-2-5/_import.txt" +@include "npc/006-2-6/_import.txt" @include "npc/006-2/_import.txt" @include "npc/006-3/_import.txt" @include "npc/006-4-1/_import.txt" -- cgit v1.2.3-60-g2f50