diff options
39 files changed, 156 insertions, 24 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 645e53ed7..d9b9a6c80 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -188,6 +188,18 @@ map_list: ( "025-2-1", "025-2", "027-1", + "042-0", + "042-1", + "042-10", + "042-11", + "042-2", + "042-3", + "042-4", + "042-5", + "042-6", + "042-7", + "042-8", + "042-9", "boss", "botcheck", "guilds", diff --git a/db/map_index.txt b/db/map_index.txt index b481eb446..9f3f846ca 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -185,27 +185,39 @@ 025-2-1 185 025-2 186 027-1 187 -boss 188 -botcheck 189 -guilds 190 -maze0 191 -maze1 192 -maze10 193 -maze11 194 -maze12 195 -maze13 196 -maze14 197 -maze15 198 -maze2 199 -maze3 200 -maze4 201 -maze5 202 -maze6 203 -maze7 204 -maze8 205 -maze9 206 -sec_pri 207 -soren-2 208 -soren 209 -test 210 -testbg 211 +042-0 188 +042-1 189 +042-10 190 +042-11 191 +042-2 192 +042-3 193 +042-4 194 +042-5 195 +042-6 196 +042-7 197 +042-8 198 +042-9 199 +boss 200 +botcheck 201 +guilds 202 +maze0 203 +maze1 204 +maze10 205 +maze11 206 +maze12 207 +maze13 208 +maze14 209 +maze15 210 +maze2 211 +maze3 212 +maze4 213 +maze5 214 +maze6 215 +maze7 216 +maze8 217 +maze9 218 +sec_pri 219 +soren-2 220 +soren 221 +test 222 +testbg 223 diff --git a/maps/re/042-0.mcache b/maps/re/042-0.mcache Binary files differnew file mode 100644 index 000000000..411c7544a --- /dev/null +++ b/maps/re/042-0.mcache diff --git a/maps/re/042-1.mcache b/maps/re/042-1.mcache Binary files differnew file mode 100644 index 000000000..9d7fc145a --- /dev/null +++ b/maps/re/042-1.mcache diff --git a/maps/re/042-10.mcache b/maps/re/042-10.mcache Binary files differnew file mode 100644 index 000000000..94de46a4e --- /dev/null +++ b/maps/re/042-10.mcache diff --git a/maps/re/042-11.mcache b/maps/re/042-11.mcache Binary files differnew file mode 100644 index 000000000..583cb91bb --- /dev/null +++ b/maps/re/042-11.mcache diff --git a/maps/re/042-2.mcache b/maps/re/042-2.mcache Binary files differnew file mode 100644 index 000000000..fd51890f3 --- /dev/null +++ b/maps/re/042-2.mcache diff --git a/maps/re/042-3.mcache b/maps/re/042-3.mcache Binary files differnew file mode 100644 index 000000000..1565b2b65 --- /dev/null +++ b/maps/re/042-3.mcache diff --git a/maps/re/042-4.mcache b/maps/re/042-4.mcache Binary files differnew file mode 100644 index 000000000..314434b0d --- /dev/null +++ b/maps/re/042-4.mcache diff --git a/maps/re/042-5.mcache b/maps/re/042-5.mcache Binary files differnew file mode 100644 index 000000000..fa52bd337 --- /dev/null +++ b/maps/re/042-5.mcache diff --git a/maps/re/042-6.mcache b/maps/re/042-6.mcache Binary files differnew file mode 100644 index 000000000..cd61cefa7 --- /dev/null +++ b/maps/re/042-6.mcache diff --git a/maps/re/042-7.mcache b/maps/re/042-7.mcache Binary files differnew file mode 100644 index 000000000..153d3feac --- /dev/null +++ b/maps/re/042-7.mcache diff --git a/maps/re/042-8.mcache b/maps/re/042-8.mcache Binary files differnew file mode 100644 index 000000000..08964f517 --- /dev/null +++ b/maps/re/042-8.mcache diff --git a/maps/re/042-9.mcache b/maps/re/042-9.mcache Binary files differnew file mode 100644 index 000000000..2e3e011d8 --- /dev/null +++ b/maps/re/042-9.mcache diff --git a/npc/042-0/_import.txt b/npc/042-0/_import.txt new file mode 100644 index 000000000..7e15c38f5 --- /dev/null +++ b/npc/042-0/_import.txt @@ -0,0 +1,3 @@ +// Map 042-0: Camelot - Throne Room +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/042-0/_warps.txt", diff --git a/npc/042-0/_warps.txt b/npc/042-0/_warps.txt new file mode 100644 index 000000000..5992a3d11 --- /dev/null +++ b/npc/042-0/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 042-0: Camelot - Throne Room warps +042-0,60,81,0 warp #042-0_60_81 3,0,014-4,67,27 +042-0,69,24,0 warp #042-0_69_24 0,0,042-1,55,99 diff --git a/npc/042-1/_import.txt b/npc/042-1/_import.txt new file mode 100644 index 000000000..8c370b795 --- /dev/null +++ b/npc/042-1/_import.txt @@ -0,0 +1,3 @@ +// Map 042-1: Camelot - Weapon Room +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/042-1/_warps.txt", diff --git a/npc/042-1/_warps.txt b/npc/042-1/_warps.txt new file mode 100644 index 000000000..949f73611 --- /dev/null +++ b/npc/042-1/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 042-1: Camelot - Weapon Room warps +042-1,55,100,0 warp #042-1_55_100 0,0,042-0,69,25 +042-1,51,23,0 warp #042-1_51_23 0,0,042-2,44,59 diff --git a/npc/042-10/_import.txt b/npc/042-10/_import.txt new file mode 100644 index 000000000..8e72d1df3 --- /dev/null +++ b/npc/042-10/_import.txt @@ -0,0 +1,3 @@ +// Map 042-10: Camelot Sewer West Path +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/042-10/_warps.txt", diff --git a/npc/042-10/_warps.txt b/npc/042-10/_warps.txt new file mode 100644 index 000000000..ab50c7a44 --- /dev/null +++ b/npc/042-10/_warps.txt @@ -0,0 +1,9 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 042-10: Camelot Caves warps +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 042-10: Camelot Sewer West Path warps +042-10,86,139,0 warp #042-10_86_139 3,0,042-7,61,57 +042-10,149,136,0 warp #042-10_149_136 0,0,042-6,55,21 +042-10,21,139,0 warp #042-10_21_139 2,0,042-8,80,55 +042-10,20,80,0 warp #042-10_20_80 0,6,042-9,98,22 +042-10,142,20,0 warp #042-10_142_20 4,0,042-11,41,56 diff --git a/npc/042-11/_import.txt b/npc/042-11/_import.txt new file mode 100644 index 000000000..3e3d6ffb6 --- /dev/null +++ b/npc/042-11/_import.txt @@ -0,0 +1,3 @@ +// Map 042-11: Camelot Sewer West Path +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/042-11/_warps.txt", diff --git a/npc/042-11/_warps.txt b/npc/042-11/_warps.txt new file mode 100644 index 000000000..c5ffd25ac --- /dev/null +++ b/npc/042-11/_warps.txt @@ -0,0 +1,6 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 042-11: Boss Chamber warps +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 042-11: Camelot Sewer West Path warps +042-11,41,57,0 warp #042-11_41_57 4,0,042-10,143,21 +042-11,20,28,0 warp #042-11_20_28 0,2,042-0,46,25 diff --git a/npc/042-2/_import.txt b/npc/042-2/_import.txt new file mode 100644 index 000000000..b40dc76b0 --- /dev/null +++ b/npc/042-2/_import.txt @@ -0,0 +1,3 @@ +// Map 042-2: Camelot - Basement +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/042-2/_warps.txt", diff --git a/npc/042-2/_warps.txt b/npc/042-2/_warps.txt new file mode 100644 index 000000000..e945b8ec6 --- /dev/null +++ b/npc/042-2/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 042-2: Camelot - Basement warps +042-2,44,60,0 warp #042-2_44_60 0,0,042-1,51,24 +042-2,41,22,0 warp #042-2_41_22 0,0,042-3,58,139 diff --git a/npc/042-3/_import.txt b/npc/042-3/_import.txt new file mode 100644 index 000000000..abbb39d5f --- /dev/null +++ b/npc/042-3/_import.txt @@ -0,0 +1,3 @@ +// Map 042-3: Camelot - Jail +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/042-3/_warps.txt", diff --git a/npc/042-3/_warps.txt b/npc/042-3/_warps.txt new file mode 100644 index 000000000..f7176b91c --- /dev/null +++ b/npc/042-3/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 042-3: Camelot - Jail warps +042-3,58,140,0 warp #042-3_58_140 0,0,042-2,41,23 +042-3,63,19,0 warp #042-3_63_19 1,0,042-4,60,77 diff --git a/npc/042-4/_import.txt b/npc/042-4/_import.txt new file mode 100644 index 000000000..e054eb681 --- /dev/null +++ b/npc/042-4/_import.txt @@ -0,0 +1,3 @@ +// Map 042-4: Camelot - Sewer +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/042-4/_warps.txt", diff --git a/npc/042-4/_warps.txt b/npc/042-4/_warps.txt new file mode 100644 index 000000000..042fa3053 --- /dev/null +++ b/npc/042-4/_warps.txt @@ -0,0 +1,5 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 042-4: Camelot - Sewer warps +042-4,60,78,0 warp #042-4_60_78 1,0,042-3,62,20 +042-4,74,20,0 warp #042-4_74_20 2,0,042-5,43,98 +042-4,67,20,0 warp #042-4_67_20 0,0,042-5,36,98 diff --git a/npc/042-5/_import.txt b/npc/042-5/_import.txt new file mode 100644 index 000000000..3b84e6ab4 --- /dev/null +++ b/npc/042-5/_import.txt @@ -0,0 +1,3 @@ +// Map 042-5: Camelot - Sewer Paths +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/042-5/_warps.txt", diff --git a/npc/042-5/_warps.txt b/npc/042-5/_warps.txt new file mode 100644 index 000000000..7ef41efcf --- /dev/null +++ b/npc/042-5/_warps.txt @@ -0,0 +1,8 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 042-5: Camelot - Sewer Paths warps +042-5,36,99,0 warp #042-5_36_99 0,0,042-4,67,21 +042-5,43,99,0 warp #042-5_43_99 2,0,042-4,74,21 +042-5,59,55,0 warp #042-5_59_55 0,3,042-6,22,76 +042-5,56,20,0 warp #042-5_56_20 2,0,042-7,21,77 +042-5,44,20,0 warp #042-5_44_20 2,0,042-8,51,78 +042-5,20,42,0 warp #042-5_20_42 0,6,042-9,98,79 diff --git a/npc/042-6/_import.txt b/npc/042-6/_import.txt new file mode 100644 index 000000000..03a6a9978 --- /dev/null +++ b/npc/042-6/_import.txt @@ -0,0 +1,3 @@ +// Map 042-6: Camelot Sewer East Path +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/042-6/_warps.txt", diff --git a/npc/042-6/_warps.txt b/npc/042-6/_warps.txt new file mode 100644 index 000000000..e7dcbaf35 --- /dev/null +++ b/npc/042-6/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 042-6: Camelot Sewer East Path warps +042-6,21,76,0 warp #042-6_21_76 0,3,042-5,58,53 +042-6,55,20,0 warp #042-6_55_20 0,0,042-10,149,135 diff --git a/npc/042-7/_import.txt b/npc/042-7/_import.txt new file mode 100644 index 000000000..2d8416c0e --- /dev/null +++ b/npc/042-7/_import.txt @@ -0,0 +1,3 @@ +// Map 042-7: Camelot Sewer Northeast Path +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/042-7/_warps.txt", diff --git a/npc/042-7/_warps.txt b/npc/042-7/_warps.txt new file mode 100644 index 000000000..d6a57f36c --- /dev/null +++ b/npc/042-7/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 042-7: Camelot Sewer Northeast Path warps +042-7,21,78,0 warp #042-7_21_78 3,0,042-5,56,21 +042-7,62,56,0 warp #042-7_62_56 3,0,042-10,86,138 diff --git a/npc/042-8/_import.txt b/npc/042-8/_import.txt new file mode 100644 index 000000000..ec5274d3e --- /dev/null +++ b/npc/042-8/_import.txt @@ -0,0 +1,3 @@ +// Map 042-8: Camelot Sewer Northwest Path +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/042-8/_warps.txt", diff --git a/npc/042-8/_warps.txt b/npc/042-8/_warps.txt new file mode 100644 index 000000000..3752ef012 --- /dev/null +++ b/npc/042-8/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 042-8: Camelot Sewer Northwest Path warps +042-8,51,79,0 warp #042-8_51_79 2,0,042-5,44,21 +042-8,81,54,0 warp #042-8_81_54 2,0,042-10,23,138 diff --git a/npc/042-9/_import.txt b/npc/042-9/_import.txt new file mode 100644 index 000000000..1de7c272a --- /dev/null +++ b/npc/042-9/_import.txt @@ -0,0 +1,3 @@ +// Map 042-9: Camelot Sewer West Path +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/042-9/_warps.txt", diff --git a/npc/042-9/_warps.txt b/npc/042-9/_warps.txt new file mode 100644 index 000000000..3bc111250 --- /dev/null +++ b/npc/042-9/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 042-9: Camelot Sewer West Path warps +042-9,99,21,0 warp #042-9_99_21 0,4,042-10,21,79 +042-9,99,80,0 warp #042-9_99_80 0,6,042-5,21,43 diff --git a/npc/_import.txt b/npc/_import.txt index 615cba83e..551035d17 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -187,6 +187,18 @@ @include "npc/025-2-1/_import.txt" @include "npc/025-2/_import.txt" @include "npc/027-1/_import.txt" +@include "npc/042-0/_import.txt" +@include "npc/042-1/_import.txt" +@include "npc/042-10/_import.txt" +@include "npc/042-11/_import.txt" +@include "npc/042-2/_import.txt" +@include "npc/042-3/_import.txt" +@include "npc/042-4/_import.txt" +@include "npc/042-5/_import.txt" +@include "npc/042-6/_import.txt" +@include "npc/042-7/_import.txt" +@include "npc/042-8/_import.txt" +@include "npc/042-9/_import.txt" @include "npc/boss/_import.txt" @include "npc/botcheck/_import.txt" @include "npc/guilds/_import.txt" |