From 897561a791f0784487c35af7af21715990431346 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 7 May 2022 20:52:33 -0300 Subject: Some missing maps from The Episode --- conf/map/maps.conf | 4 +++ db/map_index.txt | 62 +++++++++++++++++++++++--------------------- maps/re/032-2.mcache | Bin 0 -> 2522 bytes maps/re/032-3.mcache | Bin 0 -> 812 bytes maps/re/032-4.mcache | Bin 0 -> 303 bytes maps/re/032-5.mcache | Bin 0 -> 123 bytes npc/032-2/_import.txt | 2 ++ npc/032-3/_import.txt | 2 ++ npc/032-4/_import.txt | 3 +++ npc/032-4/_warps.txt | 4 +++ npc/032-5/_import.txt | 3 +++ npc/032-5/_warps.txt | 3 +++ npc/_import.txt | 4 +++ npc/functions/weather.txt | 1 + npc/items/lofteleporter.txt | 8 +++++- 15 files changed, 66 insertions(+), 30 deletions(-) create mode 100644 maps/re/032-2.mcache create mode 100644 maps/re/032-3.mcache create mode 100644 maps/re/032-4.mcache create mode 100644 maps/re/032-5.mcache create mode 100644 npc/032-2/_import.txt create mode 100644 npc/032-3/_import.txt create mode 100644 npc/032-4/_import.txt create mode 100644 npc/032-4/_warps.txt create mode 100644 npc/032-5/_import.txt create mode 100644 npc/032-5/_warps.txt diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 3f986a182..599c51db2 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -375,6 +375,10 @@ map_list: ( "031-8", "031-9", "032-1", + "032-2", + "032-3", + "032-4", + "032-5", "033-1", "033-2", "033-3", diff --git a/db/map_index.txt b/db/map_index.txt index c3d1a1a2b..833b324e0 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -372,32 +372,36 @@ 031-8 372 031-9 373 032-1 374 -033-1 375 -033-2 376 -033-3 377 -033-4 378 -033-5 379 -034-1 380 -034-2 381 -034-3 382 -034-4 383 -042-0 384 -042-1 385 -042-10 386 -042-11 387 -042-2 388 -042-3 389 -042-4 390 -042-5 391 -042-6 392 -042-7 393 -042-8 394 -042-9 395 -boss 396 -botcheck 397 -guilds 398 -sec_pri 399 -soren-2 400 -soren 401 -test 402 -testbg 403 +032-2 375 +032-3 376 +032-4 377 +032-5 378 +033-1 379 +033-2 380 +033-3 381 +033-4 382 +033-5 383 +034-1 384 +034-2 385 +034-3 386 +034-4 387 +042-0 388 +042-1 389 +042-10 390 +042-11 391 +042-2 392 +042-3 393 +042-4 394 +042-5 395 +042-6 396 +042-7 397 +042-8 398 +042-9 399 +boss 400 +botcheck 401 +guilds 402 +sec_pri 403 +soren-2 404 +soren 405 +test 406 +testbg 407 diff --git a/maps/re/032-2.mcache b/maps/re/032-2.mcache new file mode 100644 index 000000000..39ba0dc60 Binary files /dev/null and b/maps/re/032-2.mcache differ diff --git a/maps/re/032-3.mcache b/maps/re/032-3.mcache new file mode 100644 index 000000000..9f74ecac6 Binary files /dev/null and b/maps/re/032-3.mcache differ diff --git a/maps/re/032-4.mcache b/maps/re/032-4.mcache new file mode 100644 index 000000000..24c6526e6 Binary files /dev/null and b/maps/re/032-4.mcache differ diff --git a/maps/re/032-5.mcache b/maps/re/032-5.mcache new file mode 100644 index 000000000..946b315a0 Binary files /dev/null and b/maps/re/032-5.mcache differ diff --git a/npc/032-2/_import.txt b/npc/032-2/_import.txt new file mode 100644 index 000000000..f2f8746c3 --- /dev/null +++ b/npc/032-2/_import.txt @@ -0,0 +1,2 @@ +// Map 032-2: Tree Maze +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/032-3/_import.txt b/npc/032-3/_import.txt new file mode 100644 index 000000000..c9c6ea84f --- /dev/null +++ b/npc/032-3/_import.txt @@ -0,0 +1,2 @@ +// Map 032-3: Beasts Dungeon +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/032-4/_import.txt b/npc/032-4/_import.txt new file mode 100644 index 000000000..8c4d4817c --- /dev/null +++ b/npc/032-4/_import.txt @@ -0,0 +1,3 @@ +// Map 032-4: Crypt +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/032-4/_warps.txt", diff --git a/npc/032-4/_warps.txt b/npc/032-4/_warps.txt new file mode 100644 index 000000000..a7935b179 --- /dev/null +++ b/npc/032-4/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 032-4: Crypt warps +032-4,127,44,0 warp #032-4_127_44 2,0,032-4,37,20 +032-4,41,78,0 warp #032-4_41_78 3,0,032-3,121,71 diff --git a/npc/032-5/_import.txt b/npc/032-5/_import.txt new file mode 100644 index 000000000..9599db65b --- /dev/null +++ b/npc/032-5/_import.txt @@ -0,0 +1,3 @@ +// Map 032-5: Inner Chamber +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/032-5/_warps.txt", diff --git a/npc/032-5/_warps.txt b/npc/032-5/_warps.txt new file mode 100644 index 000000000..698d90b58 --- /dev/null +++ b/npc/032-5/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 032-5: Inner Chamber warps +032-5,37,19,0 warp #032-5_37_19 2,0,032-4,127,43 diff --git a/npc/_import.txt b/npc/_import.txt index 80d1b554f..f7cca4faf 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -374,6 +374,10 @@ @include "npc/031-8/_import.txt" @include "npc/031-9/_import.txt" @include "npc/032-1/_import.txt" +@include "npc/032-2/_import.txt" +@include "npc/032-3/_import.txt" +@include "npc/032-4/_import.txt" +@include "npc/032-5/_import.txt" @include "npc/033-1/_import.txt" @include "npc/033-2/_import.txt" @include "npc/033-3/_import.txt" diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt index f2642ee80..92eb4ea8c 100644 --- a/npc/functions/weather.txt +++ b/npc/functions/weather.txt @@ -73,6 +73,7 @@ OnInit: htput(.wcore, "009-1", "desert"); htput(.wcore, "010-1", "desert"); htput(.wcore, "010-2", "desert"); + htput(.wcore, "032-1", "desert"); // Woodlands htput(.wcore, "001-4", "woodland"); diff --git a/npc/items/lofteleporter.txt b/npc/items/lofteleporter.txt index e40c32cef..05d6d028f 100644 --- a/npc/items/lofteleporter.txt +++ b/npc/items/lofteleporter.txt @@ -57,7 +57,7 @@ OnUse: rif(TELEPORTERS & TP_HALIN, l("Halinarzo (@@m)", 120-.@x)), rif(TELEPORTERS & TP_LILIT, l("Lilit (@@m)", 150-.@x)), rif(GSET_SOULMENHIR_MANUAL, l("Save Point (@@m)", 30-.@x)), - rif(false, l("200 years ago, The Great Fire (%dm)", 360-.@x)); + rif(false, l("200 years ago, The Great Fire (%dm)", 360-(.@x*2))); if (@menu == 1) close; @@ -106,6 +106,12 @@ OnUse: teleporthome(); @timer_navio_running=0; break; + case 8: + atcommand("@block "+strcharinfo(0)); + warp "032-1", 23, 25; + TELEPORTER_TIME=loftel_time(360, .@x*2); + @timer_navio_running=0; + break; } closedialog; end; -- cgit v1.2.3-60-g2f50