From 06d256053a09359e48f7d9ab77a14f81faf5599e Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 19 Oct 2021 15:55:48 -0300 Subject: Acknowledge a bunch of placeholder maps which serve as Aethyr Indoors --- conf/map/maps.conf | 8 ++++++++ db/map_index.txt | 48 +++++++++++++++++++++++++++------------------- maps/re/031-2.mcache | Bin 0 -> 118 bytes maps/re/031-3.mcache | Bin 0 -> 99 bytes maps/re/031-4.mcache | Bin 0 -> 100 bytes maps/re/031-5.mcache | Bin 0 -> 109 bytes maps/re/031-6.mcache | Bin 0 -> 96 bytes maps/re/031-7.mcache | Bin 0 -> 133 bytes maps/re/031-8.mcache | Bin 0 -> 98 bytes maps/re/031-9.mcache | Bin 0 -> 92 bytes npc/031-1/_warps.txt | 3 +++ npc/031-2/_import.txt | 3 +++ npc/031-2/_warps.txt | 3 +++ npc/031-3/_import.txt | 2 ++ npc/031-4/_import.txt | 2 ++ npc/031-5/_import.txt | 3 +++ npc/031-5/_warps.txt | 3 +++ npc/031-6/_import.txt | 2 ++ npc/031-7/_import.txt | 3 +++ npc/031-7/_warps.txt | 3 +++ npc/031-8/_import.txt | 2 ++ npc/031-9/_import.txt | 2 ++ npc/_import.txt | 8 ++++++++ npc/functions/weather.txt | 1 + 24 files changed, 76 insertions(+), 20 deletions(-) create mode 100644 maps/re/031-2.mcache create mode 100644 maps/re/031-3.mcache create mode 100644 maps/re/031-4.mcache create mode 100644 maps/re/031-5.mcache create mode 100644 maps/re/031-6.mcache create mode 100644 maps/re/031-7.mcache create mode 100644 maps/re/031-8.mcache create mode 100644 maps/re/031-9.mcache create mode 100644 npc/031-2/_import.txt create mode 100644 npc/031-2/_warps.txt create mode 100644 npc/031-3/_import.txt create mode 100644 npc/031-4/_import.txt create mode 100644 npc/031-5/_import.txt create mode 100644 npc/031-5/_warps.txt create mode 100644 npc/031-6/_import.txt create mode 100644 npc/031-7/_import.txt create mode 100644 npc/031-7/_warps.txt create mode 100644 npc/031-8/_import.txt create mode 100644 npc/031-9/_import.txt diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 9575251dd..7665ee9fa 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -251,6 +251,14 @@ map_list: ( "030-24", "031-0", "031-1", + "031-2", + "031-3", + "031-4", + "031-5", + "031-6", + "031-7", + "031-8", + "031-9", "042-0", "042-1", "042-10", diff --git a/db/map_index.txt b/db/map_index.txt index 3fee629c3..8dc9487cc 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -248,23 +248,31 @@ 030-24 248 031-0 249 031-1 250 -042-0 251 -042-1 252 -042-10 253 -042-11 254 -042-2 255 -042-3 256 -042-4 257 -042-5 258 -042-6 259 -042-7 260 -042-8 261 -042-9 262 -boss 263 -botcheck 264 -guilds 265 -sec_pri 266 -soren-2 267 -soren 268 -test 269 -testbg 270 +031-2 251 +031-3 252 +031-4 253 +031-5 254 +031-6 255 +031-7 256 +031-8 257 +031-9 258 +042-0 259 +042-1 260 +042-10 261 +042-11 262 +042-2 263 +042-3 264 +042-4 265 +042-5 266 +042-6 267 +042-7 268 +042-8 269 +042-9 270 +boss 271 +botcheck 272 +guilds 273 +sec_pri 274 +soren-2 275 +soren 276 +test 277 +testbg 278 diff --git a/maps/re/031-2.mcache b/maps/re/031-2.mcache new file mode 100644 index 000000000..3e6d51a78 Binary files /dev/null and b/maps/re/031-2.mcache differ diff --git a/maps/re/031-3.mcache b/maps/re/031-3.mcache new file mode 100644 index 000000000..a91c0a7e9 Binary files /dev/null and b/maps/re/031-3.mcache differ diff --git a/maps/re/031-4.mcache b/maps/re/031-4.mcache new file mode 100644 index 000000000..aa367045c Binary files /dev/null and b/maps/re/031-4.mcache differ diff --git a/maps/re/031-5.mcache b/maps/re/031-5.mcache new file mode 100644 index 000000000..f36442b95 Binary files /dev/null and b/maps/re/031-5.mcache differ diff --git a/maps/re/031-6.mcache b/maps/re/031-6.mcache new file mode 100644 index 000000000..0c82079c1 Binary files /dev/null and b/maps/re/031-6.mcache differ diff --git a/maps/re/031-7.mcache b/maps/re/031-7.mcache new file mode 100644 index 000000000..a36174da7 Binary files /dev/null and b/maps/re/031-7.mcache differ diff --git a/maps/re/031-8.mcache b/maps/re/031-8.mcache new file mode 100644 index 000000000..8fb212a1b Binary files /dev/null and b/maps/re/031-8.mcache differ diff --git a/maps/re/031-9.mcache b/maps/re/031-9.mcache new file mode 100644 index 000000000..d35e12444 Binary files /dev/null and b/maps/re/031-9.mcache differ diff --git a/npc/031-1/_warps.txt b/npc/031-1/_warps.txt index a494d29fd..88cef1837 100644 --- a/npc/031-1/_warps.txt +++ b/npc/031-1/_warps.txt @@ -3,3 +3,6 @@ 031-1,68,30,0 warp #031-1_68_30 0,0,031-0,127,46 031-1,58,104,0 warp #031-1_58_104 0,0,023-4,24,21 031-1,25,25,0 warp #031-1_25_25 0,0,031-0,25,61 +031-1,56,47,0 warp #031-1_56_47 0,0,031-7,56,51 +031-1,84,58,0 warp #031-1_84_58 0,0,031-5,95,48 +031-1,74,85,0 warp #031-1_74_85 0,0,031-2,74,88 diff --git a/npc/031-2/_import.txt b/npc/031-2/_import.txt new file mode 100644 index 000000000..47a3c2479 --- /dev/null +++ b/npc/031-2/_import.txt @@ -0,0 +1,3 @@ +// Map 031-2: Aethyr Inn +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/031-2/_warps.txt", diff --git a/npc/031-2/_warps.txt b/npc/031-2/_warps.txt new file mode 100644 index 000000000..eac0c1a1f --- /dev/null +++ b/npc/031-2/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 031-2: Aethyr Inn warps +031-2,75,89,0 warp #031-2_75_89 1,0,031-1,74,86 diff --git a/npc/031-3/_import.txt b/npc/031-3/_import.txt new file mode 100644 index 000000000..18ac51784 --- /dev/null +++ b/npc/031-3/_import.txt @@ -0,0 +1,2 @@ +// Map 031-3: Aethyr Indoors +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/031-4/_import.txt b/npc/031-4/_import.txt new file mode 100644 index 000000000..dd3355e93 --- /dev/null +++ b/npc/031-4/_import.txt @@ -0,0 +1,2 @@ +// Map 031-4: Aethyr Indoors +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/031-5/_import.txt b/npc/031-5/_import.txt new file mode 100644 index 000000000..543a827f9 --- /dev/null +++ b/npc/031-5/_import.txt @@ -0,0 +1,3 @@ +// Map 031-5: Aethyr Armory +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/031-5/_warps.txt", diff --git a/npc/031-5/_warps.txt b/npc/031-5/_warps.txt new file mode 100644 index 000000000..ed421a84d --- /dev/null +++ b/npc/031-5/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 031-5: Aethyr Armory warps +031-5,96,49,0 warp #031-5_96_49 1,0,031-1,84,59 diff --git a/npc/031-6/_import.txt b/npc/031-6/_import.txt new file mode 100644 index 000000000..47b9d7bc8 --- /dev/null +++ b/npc/031-6/_import.txt @@ -0,0 +1,2 @@ +// Map 031-6: Aethyr Indoors +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/031-7/_import.txt b/npc/031-7/_import.txt new file mode 100644 index 000000000..9a8d59f60 --- /dev/null +++ b/npc/031-7/_import.txt @@ -0,0 +1,3 @@ +// Map 031-7: Aethyr Townhall +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/031-7/_warps.txt", diff --git a/npc/031-7/_warps.txt b/npc/031-7/_warps.txt new file mode 100644 index 000000000..2a08698ba --- /dev/null +++ b/npc/031-7/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 031-7: Aethyr Townhall warps +031-7,56,52,0 warp #031-7_56_52 0,0,031-1,56,48 diff --git a/npc/031-8/_import.txt b/npc/031-8/_import.txt new file mode 100644 index 000000000..9118158ea --- /dev/null +++ b/npc/031-8/_import.txt @@ -0,0 +1,2 @@ +// Map 031-8: Aethyr Indoors +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/031-9/_import.txt b/npc/031-9/_import.txt new file mode 100644 index 000000000..4643e29fa --- /dev/null +++ b/npc/031-9/_import.txt @@ -0,0 +1,2 @@ +// Map 031-9: Aethyr Stables +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/_import.txt b/npc/_import.txt index 604c3efe3..f07dee0b3 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -250,6 +250,14 @@ @include "npc/030-24/_import.txt" @include "npc/031-0/_import.txt" @include "npc/031-1/_import.txt" +@include "npc/031-2/_import.txt" +@include "npc/031-3/_import.txt" +@include "npc/031-4/_import.txt" +@include "npc/031-5/_import.txt" +@include "npc/031-6/_import.txt" +@include "npc/031-7/_import.txt" +@include "npc/031-8/_import.txt" +@include "npc/031-9/_import.txt" @include "npc/042-0/_import.txt" @include "npc/042-1/_import.txt" @include "npc/042-10/_import.txt" diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt index 9c6111bf9..149cb1618 100644 --- a/npc/functions/weather.txt +++ b/npc/functions/weather.txt @@ -101,6 +101,7 @@ OnInit: htput(.wcore, "020-1", "iceland"); htput(.wcore, "022-1", "iceland"); htput(.wcore, "024-1", "iceland"); + htput(.wcore, "031-1", "iceland"); // Special htput(.wcore, "011-3", "special"); -- cgit v1.2.3-60-g2f50