From c72bff04727cc001b6162f2886ad1952097d5ac1 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sun, 23 Oct 2022 23:43:53 -0300 Subject: Remove some spurious maps --- Makefile | 2 +- conf/map/maps.conf | 286 +----------------------- db/map_index.txt | 542 +++++++++++----------------------------------- db/re/map_zone_db.conf | 73 ------- maps/re/000-0-0.mcache | Bin 135 -> 0 bytes maps/re/000-0-1.mcache | Bin 58 -> 0 bytes maps/re/000-0.mcache | Bin 63 -> 63 bytes maps/re/001-1.mcache | Bin 2124 -> 0 bytes maps/re/001-3-1.mcache | Bin 372 -> 0 bytes maps/re/001-3.mcache | Bin 737 -> 6731 bytes maps/re/001-5.mcache | Bin 252 -> 0 bytes maps/re/001-6.mcache | Bin 1319 -> 0 bytes maps/re/001-7.mcache | Bin 1051 -> 0 bytes maps/re/002-1.mcache | Bin 211 -> 0 bytes maps/re/002-2.mcache | Bin 180 -> 0 bytes maps/re/002-3.mcache | Bin 88 -> 0 bytes maps/re/002-4.mcache | Bin 85 -> 0 bytes maps/re/002-5.mcache | Bin 74 -> 0 bytes maps/re/003-0-1.mcache | Bin 223 -> 0 bytes maps/re/003-0-2.mcache | Bin 117 -> 0 bytes maps/re/003-0.mcache | Bin 129 -> 0 bytes maps/re/003-1-1.mcache | Bin 921 -> 0 bytes maps/re/003-1-2.mcache | Bin 67 -> 0 bytes maps/re/003-1-3.mcache | Bin 363 -> 0 bytes maps/re/003-1.mcache | Bin 1316 -> 0 bytes maps/re/003-10.mcache | Bin 191 -> 0 bytes maps/re/003-13.mcache | Bin 102 -> 0 bytes maps/re/003-2-1.mcache | Bin 115 -> 0 bytes maps/re/003-2.mcache | Bin 88 -> 0 bytes maps/re/003-4-1.mcache | Bin 109 -> 0 bytes maps/re/003-4.mcache | Bin 91 -> 0 bytes maps/re/003-5.mcache | Bin 85 -> 0 bytes maps/re/003-6.mcache | Bin 111 -> 0 bytes maps/re/003-7.mcache | Bin 96 -> 0 bytes maps/re/003-8.mcache | Bin 101 -> 0 bytes maps/re/003-9-1.mcache | Bin 119 -> 0 bytes maps/re/003-9.mcache | Bin 230 -> 0 bytes maps/re/004-1.mcache | Bin 878 -> 0 bytes maps/re/004-2-1.mcache | Bin 393 -> 0 bytes maps/re/004-2-10.mcache | Bin 78 -> 0 bytes maps/re/004-2-11.mcache | Bin 168 -> 0 bytes maps/re/004-2-12.mcache | Bin 173 -> 0 bytes maps/re/004-2-2.mcache | Bin 284 -> 0 bytes maps/re/004-2-3.mcache | Bin 1156 -> 0 bytes maps/re/004-2-4.mcache | Bin 739 -> 0 bytes maps/re/004-2-5.mcache | Bin 215 -> 0 bytes maps/re/004-2-6.mcache | Bin 224 -> 0 bytes maps/re/004-2-7.mcache | Bin 148 -> 0 bytes maps/re/004-2-8.mcache | Bin 265 -> 0 bytes maps/re/004-2-9.mcache | Bin 205 -> 0 bytes maps/re/004-2.mcache | Bin 1400 -> 0 bytes maps/re/004-3-1.mcache | Bin 222 -> 0 bytes maps/re/004-3-2.mcache | Bin 939 -> 0 bytes maps/re/004-3-3.mcache | Bin 131 -> 0 bytes maps/re/004-3-4.mcache | Bin 209 -> 0 bytes maps/re/004-3-5.mcache | Bin 119 -> 0 bytes maps/re/004-3-6.mcache | Bin 257 -> 0 bytes maps/re/004-3.mcache | Bin 241 -> 0 bytes maps/re/005-1-1.mcache | Bin 70 -> 0 bytes maps/re/005-1.mcache | Bin 936 -> 0 bytes maps/re/005-2-1.mcache | Bin 98 -> 0 bytes maps/re/005-2.mcache | Bin 101 -> 0 bytes maps/re/005-3.mcache | Bin 113 -> 0 bytes maps/re/005-4.mcache | Bin 100 -> 0 bytes maps/re/005-5.mcache | Bin 116 -> 0 bytes maps/re/005-6.mcache | Bin 96 -> 0 bytes maps/re/005-7.mcache | Bin 111 -> 0 bytes maps/re/006-0.mcache | Bin 202 -> 0 bytes maps/re/006-10.mcache | Bin 178 -> 0 bytes maps/re/006-2-1.mcache | Bin 241 -> 0 bytes maps/re/006-2-2.mcache | Bin 102 -> 0 bytes maps/re/006-2-3.mcache | Bin 206 -> 0 bytes maps/re/006-2-4.mcache | Bin 74 -> 0 bytes maps/re/006-2-5.mcache | Bin 97 -> 0 bytes maps/re/006-2-6.mcache | Bin 97 -> 0 bytes maps/re/006-2.mcache | Bin 348 -> 0 bytes maps/re/006-3.mcache | Bin 243 -> 0 bytes maps/re/006-6.mcache | Bin 281 -> 0 bytes maps/re/007-1-1.mcache | Bin 163 -> 0 bytes maps/re/007-1-2.mcache | Bin 179 -> 0 bytes maps/re/007-1.mcache | Bin 2108 -> 0 bytes maps/re/007-2.mcache | Bin 242 -> 0 bytes maps/re/008-0.mcache | Bin 223 -> 0 bytes maps/re/008-1.mcache | Bin 913 -> 0 bytes maps/re/008-2.mcache | Bin 1304 -> 0 bytes maps/re/009-1.mcache | Bin 819 -> 0 bytes maps/re/009-2.mcache | Bin 131 -> 0 bytes maps/re/009-3.mcache | Bin 110 -> 0 bytes maps/re/009-4.mcache | Bin 117 -> 0 bytes maps/re/009-5.mcache | Bin 101 -> 0 bytes maps/re/009-6.mcache | Bin 80 -> 0 bytes maps/re/009-7.mcache | Bin 80 -> 0 bytes maps/re/010-1-1.mcache | Bin 1737 -> 0 bytes maps/re/010-1-10.mcache | Bin 125 -> 0 bytes maps/re/010-1-11.mcache | Bin 84 -> 0 bytes maps/re/010-1-12.mcache | Bin 84 -> 0 bytes maps/re/010-1-2.mcache | Bin 685 -> 0 bytes maps/re/010-1-3.mcache | Bin 201 -> 0 bytes maps/re/010-1-4.mcache | Bin 173 -> 0 bytes maps/re/010-1-5.mcache | Bin 476 -> 0 bytes maps/re/010-1-6.mcache | Bin 403 -> 0 bytes maps/re/010-1-7.mcache | Bin 153 -> 0 bytes maps/re/010-1-8.mcache | Bin 81 -> 0 bytes maps/re/010-1-9.mcache | Bin 261 -> 0 bytes maps/re/010-1.mcache | Bin 966 -> 0 bytes maps/re/010-2-10.mcache | Bin 177 -> 0 bytes maps/re/010-2-11.mcache | Bin 202 -> 0 bytes maps/re/010-2-12.mcache | Bin 176 -> 0 bytes maps/re/010-2-13.mcache | Bin 116 -> 0 bytes maps/re/010-2-14.mcache | Bin 152 -> 0 bytes maps/re/010-2-15.mcache | Bin 144 -> 0 bytes maps/re/010-2-16.mcache | Bin 367 -> 0 bytes maps/re/010-2-2.mcache | Bin 388 -> 0 bytes maps/re/010-2-3.mcache | Bin 382 -> 0 bytes maps/re/010-2-4.mcache | Bin 184 -> 0 bytes maps/re/010-2-5.mcache | Bin 224 -> 0 bytes maps/re/010-2-6.mcache | Bin 224 -> 0 bytes maps/re/010-2-7.mcache | Bin 136 -> 0 bytes maps/re/010-2-8.mcache | Bin 145 -> 0 bytes maps/re/010-2-9.mcache | Bin 143 -> 0 bytes maps/re/010-2.mcache | Bin 1805 -> 0 bytes maps/re/010-3.mcache | Bin 84 -> 0 bytes maps/re/010-4-1.mcache | Bin 186 -> 0 bytes maps/re/010-4-2.mcache | Bin 319 -> 0 bytes maps/re/011-2.mcache | Bin 529 -> 0 bytes maps/re/011-3.mcache | Bin 697 -> 0 bytes maps/re/012-1.mcache | Bin 1015 -> 0 bytes maps/re/012-2.mcache | Bin 170 -> 0 bytes maps/re/012-3.mcache | Bin 82 -> 0 bytes maps/re/012-4.mcache | Bin 79 -> 0 bytes maps/re/012-5.mcache | Bin 101 -> 0 bytes maps/re/012-6.mcache | Bin 106 -> 0 bytes maps/re/012-7.mcache | Bin 129 -> 0 bytes maps/re/012-8.mcache | Bin 80 -> 0 bytes maps/re/013-1.mcache | Bin 801 -> 0 bytes maps/re/014-1.mcache | Bin 1038 -> 0 bytes maps/re/014-2-1.mcache | Bin 101 -> 0 bytes maps/re/014-2-2.mcache | Bin 111 -> 0 bytes maps/re/014-2.mcache | Bin 1964 -> 0 bytes maps/re/014-3.mcache | Bin 1728 -> 0 bytes maps/re/014-4.mcache | Bin 1111 -> 0 bytes maps/re/014-5-1.mcache | Bin 82 -> 0 bytes maps/re/014-5.mcache | Bin 2315 -> 0 bytes maps/re/015-1.mcache | Bin 1538 -> 0 bytes maps/re/015-2.mcache | Bin 2243 -> 0 bytes maps/re/015-3-1.mcache | Bin 449 -> 0 bytes maps/re/015-3-2.mcache | Bin 493 -> 0 bytes maps/re/015-3-3.mcache | Bin 436 -> 0 bytes maps/re/015-3.mcache | Bin 1355 -> 0 bytes maps/re/015-4.mcache | Bin 274 -> 0 bytes maps/re/015-5.mcache | Bin 3327 -> 0 bytes maps/re/015-6.mcache | Bin 4007 -> 0 bytes maps/re/015-7.mcache | Bin 264 -> 0 bytes maps/re/015-8-1.mcache | Bin 282 -> 0 bytes maps/re/015-8.mcache | Bin 1222 -> 0 bytes maps/re/016-1.mcache | Bin 101 -> 0 bytes maps/re/016-6.mcache | Bin 102 -> 0 bytes maps/re/016-7.mcache | Bin 123 -> 0 bytes maps/re/017-0.mcache | Bin 4860 -> 0 bytes maps/re/017-1.mcache | Bin 4245 -> 0 bytes maps/re/017-10.mcache | Bin 411 -> 0 bytes maps/re/017-2-1.mcache | Bin 523 -> 0 bytes maps/re/017-2.mcache | Bin 99 -> 0 bytes maps/re/017-3.mcache | Bin 347 -> 0 bytes maps/re/017-4.mcache | Bin 159 -> 0 bytes maps/re/017-5.mcache | Bin 116 -> 0 bytes maps/re/017-6.mcache | Bin 120 -> 0 bytes maps/re/017-7.mcache | Bin 80 -> 0 bytes maps/re/017-8.mcache | Bin 80 -> 0 bytes maps/re/018-1-1.mcache | Bin 352 -> 0 bytes maps/re/018-1.mcache | Bin 365 -> 0 bytes maps/re/018-2-2.mcache | Bin 2265 -> 0 bytes maps/re/018-2-3.mcache | Bin 2265 -> 0 bytes maps/re/018-2-4.mcache | Bin 118 -> 0 bytes maps/re/018-3.mcache | Bin 808 -> 0 bytes maps/re/018-4-1.mcache | Bin 718 -> 0 bytes maps/re/018-4-2.mcache | Bin 94 -> 0 bytes maps/re/018-4.mcache | Bin 1029 -> 0 bytes maps/re/018-5-0.mcache | Bin 198 -> 0 bytes maps/re/018-5-1.mcache | Bin 581 -> 0 bytes maps/re/018-5-2.mcache | Bin 111 -> 0 bytes maps/re/018-5-3.mcache | Bin 110 -> 0 bytes maps/re/018-5-4.mcache | Bin 457 -> 0 bytes maps/re/018-5-5.mcache | Bin 114 -> 0 bytes maps/re/018-5-boss.mcache | Bin 125 -> 0 bytes maps/re/018-5.mcache | Bin 719 -> 0 bytes maps/re/018-6-0.mcache | Bin 249 -> 0 bytes maps/re/018-6-1.mcache | Bin 1278 -> 0 bytes maps/re/018-6-2.mcache | Bin 543 -> 0 bytes maps/re/018-6-3.mcache | Bin 624 -> 0 bytes maps/re/018-7-1.mcache | Bin 397 -> 0 bytes maps/re/018-7.mcache | Bin 450 -> 0 bytes maps/re/019-1-1.mcache | Bin 105 -> 0 bytes maps/re/019-1.mcache | Bin 613 -> 0 bytes maps/re/019-2.mcache | Bin 724 -> 0 bytes maps/re/019-3.mcache | Bin 1317 -> 0 bytes maps/re/019-4-1.mcache | Bin 126 -> 0 bytes maps/re/019-4.mcache | Bin 575 -> 0 bytes maps/re/019-5-1.mcache | Bin 782 -> 0 bytes maps/re/019-5-2.mcache | Bin 926 -> 0 bytes maps/re/019-5-3.mcache | Bin 80 -> 0 bytes maps/re/019-5.mcache | Bin 3735 -> 0 bytes maps/re/019-6.mcache | Bin 1986 -> 0 bytes maps/re/020-1.mcache | Bin 618 -> 0 bytes maps/re/020-2.mcache | Bin 93 -> 0 bytes maps/re/020-3.mcache | Bin 90 -> 0 bytes maps/re/020-4.mcache | Bin 160 -> 0 bytes maps/re/020-5.mcache | Bin 94 -> 0 bytes maps/re/020-6.mcache | Bin 92 -> 0 bytes maps/re/020-7-1.mcache | Bin 394 -> 0 bytes maps/re/020-7-2.mcache | Bin 594 -> 0 bytes maps/re/020-7.mcache | Bin 136 -> 0 bytes maps/re/021-0.mcache | Bin 179 -> 0 bytes maps/re/021-1.mcache | Bin 3185 -> 0 bytes maps/re/021-2.mcache | Bin 654 -> 0 bytes maps/re/021-3.mcache | Bin 411 -> 0 bytes maps/re/021-4.mcache | Bin 676 -> 0 bytes maps/re/022-1.mcache | Bin 709 -> 0 bytes maps/re/023-1.mcache | Bin 273 -> 0 bytes maps/re/023-2.mcache | Bin 476 -> 0 bytes maps/re/023-3-1.mcache | Bin 162 -> 0 bytes maps/re/023-3-2.mcache | Bin 169 -> 0 bytes maps/re/023-3.mcache | Bin 1633 -> 0 bytes maps/re/023-4.mcache | Bin 236 -> 0 bytes maps/re/024-1.mcache | Bin 1181 -> 0 bytes maps/re/024-10.mcache | Bin 68 -> 0 bytes maps/re/024-11.mcache | Bin 80 -> 0 bytes maps/re/024-12.mcache | Bin 71 -> 0 bytes maps/re/024-13.mcache | Bin 75 -> 0 bytes maps/re/024-14.mcache | Bin 67 -> 0 bytes maps/re/024-15.mcache | Bin 96 -> 0 bytes maps/re/024-16.mcache | Bin 108 -> 0 bytes maps/re/024-2.mcache | Bin 87 -> 0 bytes maps/re/024-3.mcache | Bin 69 -> 0 bytes maps/re/024-4.mcache | Bin 75 -> 0 bytes maps/re/024-5.mcache | Bin 69 -> 0 bytes maps/re/024-6.mcache | Bin 77 -> 0 bytes maps/re/024-7.mcache | Bin 80 -> 0 bytes maps/re/024-8.mcache | Bin 95 -> 0 bytes maps/re/024-9.mcache | Bin 82 -> 0 bytes maps/re/025-1.mcache | Bin 1933 -> 0 bytes maps/re/025-2-1.mcache | Bin 633 -> 0 bytes maps/re/025-2-2.mcache | Bin 230 -> 0 bytes maps/re/025-2-3.mcache | Bin 205 -> 0 bytes maps/re/025-2-4.mcache | Bin 503 -> 0 bytes maps/re/025-2.mcache | Bin 1231 -> 0 bytes maps/re/025-3.mcache | Bin 467 -> 0 bytes maps/re/026-0.mcache | Bin 381 -> 0 bytes maps/re/026-1.mcache | Bin 348 -> 0 bytes maps/re/026-2.mcache | Bin 493 -> 0 bytes maps/re/027-0.mcache | Bin 210 -> 0 bytes maps/re/027-1.mcache | Bin 983 -> 0 bytes maps/re/027-2.mcache | Bin 114 -> 0 bytes maps/re/027-3.mcache | Bin 106 -> 0 bytes maps/re/027-4.mcache | Bin 86 -> 0 bytes maps/re/027-5.mcache | Bin 68 -> 0 bytes maps/re/027-6.mcache | Bin 111 -> 0 bytes maps/re/027-7.mcache | Bin 247 -> 0 bytes maps/re/029-0.mcache | Bin 3118 -> 0 bytes maps/re/029-1.mcache | Bin 6731 -> 0 bytes maps/re/029-2.mcache | Bin 200 -> 0 bytes maps/re/029-3.mcache | Bin 477 -> 0 bytes maps/re/029-4.mcache | Bin 755 -> 0 bytes maps/re/029-5.mcache | Bin 424 -> 0 bytes maps/re/029-6.mcache | Bin 1375 -> 0 bytes maps/re/029-7.mcache | Bin 1231 -> 0 bytes maps/re/029-8.mcache | Bin 5338 -> 0 bytes maps/re/029-9.mcache | Bin 242 -> 0 bytes maps/re/031-1.mcache | Bin 660 -> 619 bytes maps/re/032-1.mcache | Bin 2107 -> 0 bytes maps/re/032-2.mcache | Bin 2549 -> 0 bytes maps/re/032-3.mcache | Bin 815 -> 0 bytes maps/re/032-4.mcache | Bin 306 -> 0 bytes maps/re/032-5.mcache | Bin 123 -> 0 bytes maps/re/034-1.mcache | Bin 641 -> 0 bytes maps/re/034-2.mcache | Bin 459 -> 0 bytes maps/re/034-3.mcache | Bin 327 -> 0 bytes maps/re/034-4.mcache | Bin 450 -> 0 bytes maps/re/042-0.mcache | Bin 332 -> 0 bytes maps/re/042-1.mcache | Bin 221 -> 0 bytes maps/re/042-10.mcache | Bin 1406 -> 0 bytes maps/re/042-11.mcache | Bin 144 -> 0 bytes maps/re/042-2.mcache | Bin 229 -> 0 bytes maps/re/042-3.mcache | Bin 850 -> 0 bytes maps/re/042-4.mcache | Bin 417 -> 0 bytes maps/re/042-5.mcache | Bin 381 -> 0 bytes maps/re/042-6.mcache | Bin 471 -> 0 bytes maps/re/042-7.mcache | Bin 344 -> 0 bytes maps/re/042-8.mcache | Bin 394 -> 0 bytes maps/re/042-9.mcache | Bin 444 -> 0 bytes maps/re/fermi.mcache | Bin 0 -> 71 bytes maps/re/soren-2.mcache | Bin 95 -> 0 bytes maps/re/soren.mcache | Bin 1351 -> 0 bytes npc/000-0/_import.txt | 2 +- npc/000-0/sailors.txt | 275 +++-------------------- npc/000-1/exit.txt | 3 + npc/001-1/_import.txt | 3 +- npc/001-1/_warps.txt | 6 + npc/001-2/_import.txt | 1 + npc/001-2/treasure.txt | 66 ++++++ npc/001-3/_import.txt | 3 +- npc/001-3/_warps.txt | 11 - npc/001-5/_import.txt | 3 +- npc/001-5/_mobs.txt | 8 - npc/001-5/_warps.txt | 6 +- npc/003-3/_import.txt | 1 - npc/003-3/_warps.txt | 3 - npc/006-10/_import.txt | 1 - npc/006-4-1/_import.txt | 1 - npc/006-4-1/_mobs.txt | 6 - npc/006-4/_import.txt | 1 - npc/006-4/_mobs.txt | 18 -- npc/006-4/_warps.txt | 2 +- npc/006-5/_warps.txt | 2 +- npc/007-1/treasure.txt | 86 -------- npc/011-1/_import.txt | 2 - npc/011-1/_mobs.txt | 7 - npc/011-1/_warps.txt | 2 +- npc/011-1/manastone.txt | 136 ------------ npc/015-8/_import.txt | 1 - npc/017-1/_import.txt | 1 - npc/017-2-2/_import.txt | 1 - npc/017-2-2/_mobs.txt | 4 - npc/017-2-2/_warps.txt | 2 +- npc/018-2-1/mapflags.txt | 6 +- npc/018-2/_warps.txt | 2 +- npc/018-7-1/_import.txt | 1 - npc/023-4/_import.txt | 1 - npc/025-2-4/_import.txt | 1 - npc/031-1/_import.txt | 1 - npc/031-1/_mobs.txt | 8 - npc/031-1/_warps.txt | 2 +- npc/033-1/_import.txt | 1 + npc/033-1/_warps.txt | 11 +- npc/033-1/misc.txt | 38 ++++ npc/_import.txt | 286 +----------------------- npc/botcheck/_import.txt | 1 - npc/fermi/_import.txt | 3 + npc/fermi/_warps.txt | 4 + npc/functions/dungeon.txt | 14 +- npc/functions/seasons.txt | 16 +- npc/functions/weather.txt | 33 +-- npc/guilds/_warps.txt | 2 +- npc/items/shovel.txt | 63 +----- npc/scripts.conf | 4 - 345 files changed, 325 insertions(+), 1740 deletions(-) delete mode 100644 maps/re/000-0-0.mcache delete mode 100644 maps/re/000-0-1.mcache delete mode 100644 maps/re/001-1.mcache delete mode 100644 maps/re/001-3-1.mcache delete mode 100644 maps/re/001-5.mcache delete mode 100644 maps/re/001-6.mcache delete mode 100644 maps/re/001-7.mcache delete mode 100644 maps/re/002-1.mcache delete mode 100644 maps/re/002-2.mcache delete mode 100644 maps/re/002-3.mcache delete mode 100644 maps/re/002-4.mcache delete mode 100644 maps/re/002-5.mcache delete mode 100644 maps/re/003-0-1.mcache delete mode 100644 maps/re/003-0-2.mcache delete mode 100644 maps/re/003-0.mcache delete mode 100644 maps/re/003-1-1.mcache delete mode 100644 maps/re/003-1-2.mcache delete mode 100644 maps/re/003-1-3.mcache delete mode 100644 maps/re/003-1.mcache delete mode 100644 maps/re/003-10.mcache delete mode 100644 maps/re/003-13.mcache delete mode 100644 maps/re/003-2-1.mcache delete mode 100644 maps/re/003-2.mcache delete mode 100644 maps/re/003-4-1.mcache delete mode 100644 maps/re/003-4.mcache delete mode 100644 maps/re/003-5.mcache delete mode 100644 maps/re/003-6.mcache delete mode 100644 maps/re/003-7.mcache delete mode 100644 maps/re/003-8.mcache delete mode 100644 maps/re/003-9-1.mcache delete mode 100644 maps/re/003-9.mcache delete mode 100644 maps/re/004-1.mcache delete mode 100644 maps/re/004-2-1.mcache delete mode 100644 maps/re/004-2-10.mcache delete mode 100644 maps/re/004-2-11.mcache delete mode 100644 maps/re/004-2-12.mcache delete mode 100644 maps/re/004-2-2.mcache delete mode 100644 maps/re/004-2-3.mcache delete mode 100644 maps/re/004-2-4.mcache delete mode 100644 maps/re/004-2-5.mcache delete mode 100644 maps/re/004-2-6.mcache delete mode 100644 maps/re/004-2-7.mcache delete mode 100644 maps/re/004-2-8.mcache delete mode 100644 maps/re/004-2-9.mcache delete mode 100644 maps/re/004-2.mcache delete mode 100644 maps/re/004-3-1.mcache delete mode 100644 maps/re/004-3-2.mcache delete mode 100644 maps/re/004-3-3.mcache delete mode 100644 maps/re/004-3-4.mcache delete mode 100644 maps/re/004-3-5.mcache delete mode 100644 maps/re/004-3-6.mcache delete mode 100644 maps/re/004-3.mcache delete mode 100644 maps/re/005-1-1.mcache delete mode 100644 maps/re/005-1.mcache delete mode 100644 maps/re/005-2-1.mcache delete mode 100644 maps/re/005-2.mcache delete mode 100644 maps/re/005-3.mcache delete mode 100644 maps/re/005-4.mcache delete mode 100644 maps/re/005-5.mcache delete mode 100644 maps/re/005-6.mcache delete mode 100644 maps/re/005-7.mcache delete mode 100644 maps/re/006-0.mcache delete mode 100644 maps/re/006-10.mcache delete mode 100644 maps/re/006-2-1.mcache delete mode 100644 maps/re/006-2-2.mcache delete mode 100644 maps/re/006-2-3.mcache delete mode 100644 maps/re/006-2-4.mcache delete mode 100644 maps/re/006-2-5.mcache delete mode 100644 maps/re/006-2-6.mcache delete mode 100644 maps/re/006-2.mcache delete mode 100644 maps/re/006-3.mcache delete mode 100644 maps/re/006-6.mcache delete mode 100644 maps/re/007-1-1.mcache delete mode 100644 maps/re/007-1-2.mcache delete mode 100644 maps/re/007-1.mcache delete mode 100644 maps/re/007-2.mcache delete mode 100644 maps/re/008-0.mcache delete mode 100644 maps/re/008-1.mcache delete mode 100644 maps/re/008-2.mcache delete mode 100644 maps/re/009-1.mcache delete mode 100644 maps/re/009-2.mcache delete mode 100644 maps/re/009-3.mcache delete mode 100644 maps/re/009-4.mcache delete mode 100644 maps/re/009-5.mcache delete mode 100644 maps/re/009-6.mcache delete mode 100644 maps/re/009-7.mcache delete mode 100644 maps/re/010-1-1.mcache delete mode 100644 maps/re/010-1-10.mcache delete mode 100644 maps/re/010-1-11.mcache delete mode 100644 maps/re/010-1-12.mcache delete mode 100644 maps/re/010-1-2.mcache delete mode 100644 maps/re/010-1-3.mcache delete mode 100644 maps/re/010-1-4.mcache delete mode 100644 maps/re/010-1-5.mcache delete mode 100644 maps/re/010-1-6.mcache delete mode 100644 maps/re/010-1-7.mcache delete mode 100644 maps/re/010-1-8.mcache delete mode 100644 maps/re/010-1-9.mcache delete mode 100644 maps/re/010-1.mcache delete mode 100644 maps/re/010-2-10.mcache delete mode 100644 maps/re/010-2-11.mcache delete mode 100644 maps/re/010-2-12.mcache delete mode 100644 maps/re/010-2-13.mcache delete mode 100644 maps/re/010-2-14.mcache delete mode 100644 maps/re/010-2-15.mcache delete mode 100644 maps/re/010-2-16.mcache delete mode 100644 maps/re/010-2-2.mcache delete mode 100644 maps/re/010-2-3.mcache delete mode 100644 maps/re/010-2-4.mcache delete mode 100644 maps/re/010-2-5.mcache delete mode 100644 maps/re/010-2-6.mcache delete mode 100644 maps/re/010-2-7.mcache delete mode 100644 maps/re/010-2-8.mcache delete mode 100644 maps/re/010-2-9.mcache delete mode 100644 maps/re/010-2.mcache delete mode 100644 maps/re/010-3.mcache delete mode 100644 maps/re/010-4-1.mcache delete mode 100644 maps/re/010-4-2.mcache delete mode 100644 maps/re/011-2.mcache delete mode 100644 maps/re/011-3.mcache delete mode 100644 maps/re/012-1.mcache delete mode 100644 maps/re/012-2.mcache delete mode 100644 maps/re/012-3.mcache delete mode 100644 maps/re/012-4.mcache delete mode 100644 maps/re/012-5.mcache delete mode 100644 maps/re/012-6.mcache delete mode 100644 maps/re/012-7.mcache delete mode 100644 maps/re/012-8.mcache delete mode 100644 maps/re/013-1.mcache delete mode 100644 maps/re/014-1.mcache delete mode 100644 maps/re/014-2-1.mcache delete mode 100644 maps/re/014-2-2.mcache delete mode 100644 maps/re/014-2.mcache delete mode 100644 maps/re/014-3.mcache delete mode 100644 maps/re/014-4.mcache delete mode 100644 maps/re/014-5-1.mcache delete mode 100644 maps/re/014-5.mcache delete mode 100644 maps/re/015-1.mcache delete mode 100644 maps/re/015-2.mcache delete mode 100644 maps/re/015-3-1.mcache delete mode 100644 maps/re/015-3-2.mcache delete mode 100644 maps/re/015-3-3.mcache delete mode 100644 maps/re/015-3.mcache delete mode 100644 maps/re/015-4.mcache delete mode 100644 maps/re/015-5.mcache delete mode 100644 maps/re/015-6.mcache delete mode 100644 maps/re/015-7.mcache delete mode 100644 maps/re/015-8-1.mcache delete mode 100644 maps/re/015-8.mcache delete mode 100644 maps/re/016-1.mcache delete mode 100644 maps/re/016-6.mcache delete mode 100644 maps/re/016-7.mcache delete mode 100644 maps/re/017-0.mcache delete mode 100644 maps/re/017-1.mcache delete mode 100644 maps/re/017-10.mcache delete mode 100644 maps/re/017-2-1.mcache delete mode 100644 maps/re/017-2.mcache delete mode 100644 maps/re/017-3.mcache delete mode 100644 maps/re/017-4.mcache delete mode 100644 maps/re/017-5.mcache delete mode 100644 maps/re/017-6.mcache delete mode 100644 maps/re/017-7.mcache delete mode 100644 maps/re/017-8.mcache delete mode 100644 maps/re/018-1-1.mcache delete mode 100644 maps/re/018-1.mcache delete mode 100644 maps/re/018-2-2.mcache delete mode 100644 maps/re/018-2-3.mcache delete mode 100644 maps/re/018-2-4.mcache delete mode 100644 maps/re/018-3.mcache delete mode 100644 maps/re/018-4-1.mcache delete mode 100644 maps/re/018-4-2.mcache delete mode 100644 maps/re/018-4.mcache delete mode 100644 maps/re/018-5-0.mcache delete mode 100644 maps/re/018-5-1.mcache delete mode 100644 maps/re/018-5-2.mcache delete mode 100644 maps/re/018-5-3.mcache delete mode 100644 maps/re/018-5-4.mcache delete mode 100644 maps/re/018-5-5.mcache delete mode 100644 maps/re/018-5-boss.mcache delete mode 100644 maps/re/018-5.mcache delete mode 100644 maps/re/018-6-0.mcache delete mode 100644 maps/re/018-6-1.mcache delete mode 100644 maps/re/018-6-2.mcache delete mode 100644 maps/re/018-6-3.mcache delete mode 100644 maps/re/018-7-1.mcache delete mode 100644 maps/re/018-7.mcache delete mode 100644 maps/re/019-1-1.mcache delete mode 100644 maps/re/019-1.mcache delete mode 100644 maps/re/019-2.mcache delete mode 100644 maps/re/019-3.mcache delete mode 100644 maps/re/019-4-1.mcache delete mode 100644 maps/re/019-4.mcache delete mode 100644 maps/re/019-5-1.mcache delete mode 100644 maps/re/019-5-2.mcache delete mode 100644 maps/re/019-5-3.mcache delete mode 100644 maps/re/019-5.mcache delete mode 100644 maps/re/019-6.mcache delete mode 100644 maps/re/020-1.mcache delete mode 100644 maps/re/020-2.mcache delete mode 100644 maps/re/020-3.mcache delete mode 100644 maps/re/020-4.mcache delete mode 100644 maps/re/020-5.mcache delete mode 100644 maps/re/020-6.mcache delete mode 100644 maps/re/020-7-1.mcache delete mode 100644 maps/re/020-7-2.mcache delete mode 100644 maps/re/020-7.mcache delete mode 100644 maps/re/021-0.mcache delete mode 100644 maps/re/021-1.mcache delete mode 100644 maps/re/021-2.mcache delete mode 100644 maps/re/021-3.mcache delete mode 100644 maps/re/021-4.mcache delete mode 100644 maps/re/022-1.mcache delete mode 100644 maps/re/023-1.mcache delete mode 100644 maps/re/023-2.mcache delete mode 100644 maps/re/023-3-1.mcache delete mode 100644 maps/re/023-3-2.mcache delete mode 100644 maps/re/023-3.mcache delete mode 100644 maps/re/023-4.mcache delete mode 100644 maps/re/024-1.mcache delete mode 100644 maps/re/024-10.mcache delete mode 100644 maps/re/024-11.mcache delete mode 100644 maps/re/024-12.mcache delete mode 100644 maps/re/024-13.mcache delete mode 100644 maps/re/024-14.mcache delete mode 100644 maps/re/024-15.mcache delete mode 100644 maps/re/024-16.mcache delete mode 100644 maps/re/024-2.mcache delete mode 100644 maps/re/024-3.mcache delete mode 100644 maps/re/024-4.mcache delete mode 100644 maps/re/024-5.mcache delete mode 100644 maps/re/024-6.mcache delete mode 100644 maps/re/024-7.mcache delete mode 100644 maps/re/024-8.mcache delete mode 100644 maps/re/024-9.mcache delete mode 100644 maps/re/025-1.mcache delete mode 100644 maps/re/025-2-1.mcache delete mode 100644 maps/re/025-2-2.mcache delete mode 100644 maps/re/025-2-3.mcache delete mode 100644 maps/re/025-2-4.mcache delete mode 100644 maps/re/025-2.mcache delete mode 100644 maps/re/025-3.mcache delete mode 100644 maps/re/026-0.mcache delete mode 100644 maps/re/026-1.mcache delete mode 100644 maps/re/026-2.mcache delete mode 100644 maps/re/027-0.mcache delete mode 100644 maps/re/027-1.mcache delete mode 100644 maps/re/027-2.mcache delete mode 100644 maps/re/027-3.mcache delete mode 100644 maps/re/027-4.mcache delete mode 100644 maps/re/027-5.mcache delete mode 100644 maps/re/027-6.mcache delete mode 100644 maps/re/027-7.mcache delete mode 100644 maps/re/029-0.mcache delete mode 100644 maps/re/029-1.mcache delete mode 100644 maps/re/029-2.mcache delete mode 100644 maps/re/029-3.mcache delete mode 100644 maps/re/029-4.mcache delete mode 100644 maps/re/029-5.mcache delete mode 100644 maps/re/029-6.mcache delete mode 100644 maps/re/029-7.mcache delete mode 100644 maps/re/029-8.mcache delete mode 100644 maps/re/029-9.mcache delete mode 100644 maps/re/032-1.mcache delete mode 100644 maps/re/032-2.mcache delete mode 100644 maps/re/032-3.mcache delete mode 100644 maps/re/032-4.mcache delete mode 100644 maps/re/032-5.mcache delete mode 100644 maps/re/034-1.mcache delete mode 100644 maps/re/034-2.mcache delete mode 100644 maps/re/034-3.mcache delete mode 100644 maps/re/034-4.mcache delete mode 100644 maps/re/042-0.mcache delete mode 100644 maps/re/042-1.mcache delete mode 100644 maps/re/042-10.mcache delete mode 100644 maps/re/042-11.mcache delete mode 100644 maps/re/042-2.mcache delete mode 100644 maps/re/042-3.mcache delete mode 100644 maps/re/042-4.mcache delete mode 100644 maps/re/042-5.mcache delete mode 100644 maps/re/042-6.mcache delete mode 100644 maps/re/042-7.mcache delete mode 100644 maps/re/042-8.mcache delete mode 100644 maps/re/042-9.mcache create mode 100644 maps/re/fermi.mcache delete mode 100644 maps/re/soren-2.mcache delete mode 100644 maps/re/soren.mcache create mode 100644 npc/001-1/_warps.txt create mode 100644 npc/001-2/treasure.txt delete mode 100644 npc/001-3/_warps.txt delete mode 100644 npc/001-5/_mobs.txt delete mode 100644 npc/003-3/_warps.txt delete mode 100644 npc/006-4-1/_mobs.txt delete mode 100644 npc/006-4/_mobs.txt delete mode 100644 npc/007-1/treasure.txt delete mode 100644 npc/011-1/_mobs.txt delete mode 100644 npc/011-1/manastone.txt delete mode 100644 npc/017-2-2/_mobs.txt delete mode 100644 npc/031-1/_mobs.txt create mode 100644 npc/033-1/misc.txt create mode 100644 npc/fermi/_import.txt create mode 100644 npc/fermi/_warps.txt diff --git a/Makefile b/Makefile index 8a8b883..9641f28 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ server-update: updateconfig updatedb server-updatebuild: build updateconfig updatedb maps: - cd ../tools/hercules/ ; ./tmx_converter.py ../../client-data/ ../../server-data ; ./convert_tmx_to_mapcache.py + cd ../tools/hercules/ ; ./tmx_converter.py ../../clientdata/ ../../serverdata ; ./convert_tmx_to_mapcache.py build: cd ../tools/localserver/ ; ./build.sh diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 090ad47..49d5ae6 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -1,11 +1,8 @@ map_removed: ( ) map_list: ( - "000-0-0", - "000-0-1", "000-0", "000-1", - "001-1", "001-10-1", "001-10", "001-11", @@ -16,285 +13,26 @@ map_list: ( "001-13", "001-14", "001-2", - "001-3-1", "001-3", "001-4", - "001-5", - "001-6", - "001-7", "001-8", "001-9", - "002-1", - "002-2", - "002-3", - "002-4", - "002-5", - "003-0-1", - "003-0-2", - "003-0", - "003-1-1", - "003-1-2", - "003-1-3", - "003-1", - "003-10", - "003-13", - "003-2-1", - "003-2", "003-3", - "003-4-1", - "003-4", - "003-5", - "003-6", - "003-7", - "003-8", - "003-9-1", - "003-9", - "004-1", - "004-2-1", - "004-2-10", - "004-2-11", - "004-2-12", - "004-2-2", - "004-2-3", - "004-2-4", - "004-2-5", - "004-2-6", - "004-2-7", - "004-2-8", - "004-2-9", - "004-2", - "004-3-1", - "004-3-2", - "004-3-3", - "004-3-4", - "004-3-5", - "004-3-6", - "004-3", - "005-1-1", - "005-1", - "005-2-1", - "005-2", - "005-3", - "005-4", - "005-5", - "005-6", - "005-7", - "006-0", "006-1", - "006-10", - "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", "006-4", "006-5", - "006-6", "006-7", "006-8", "006-9", - "007-1-1", - "007-1-2", - "007-1", - "007-2", - "008-0", - "008-1", - "008-2", - "009-1", - "009-2", - "009-3", - "009-4", - "009-5", - "009-6", - "009-7", - "010-1-1", - "010-1-10", - "010-1-11", - "010-1-12", - "010-1-2", - "010-1-3", - "010-1-4", - "010-1-5", - "010-1-6", - "010-1-7", - "010-1-8", - "010-1-9", - "010-1", - "010-2-10", - "010-2-11", - "010-2-12", - "010-2-13", - "010-2-14", - "010-2-15", - "010-2-16", - "010-2-2", - "010-2-3", - "010-2-4", - "010-2-5", - "010-2-6", - "010-2-7", - "010-2-8", - "010-2-9", - "010-2", - "010-3", - "010-4-1", - "010-4-2", "011-1", - "011-2", - "011-3", - "012-1", - "012-2", - "012-3", - "012-4", - "012-5", - "012-6", - "012-7", - "012-8", - "013-1", - "014-1", - "014-2-1", - "014-2-2", - "014-2", - "014-3", - "014-4", - "014-5-1", - "014-5", - "015-1", - "015-2", - "015-3-1", - "015-3-2", - "015-3-3", - "015-3", - "015-4", - "015-5", - "015-6", - "015-7", - "015-8-1", - "015-8", - "016-1", - "016-6", - "016-7", - "017-0", - "017-1", - "017-10", - "017-2-1", "017-2-2", - "017-2", - "017-3", - "017-4", - "017-5", - "017-6", - "017-7", - "017-8", - "018-1-1", - "018-1", "018-2-1", - "018-2-2", - "018-2-3", - "018-2-4", "018-2-5", "018-2-6", "018-2-7", "018-2-8", "018-2", - "018-3", - "018-4-1", - "018-4-2", - "018-4", - "018-5-0", - "018-5-1", - "018-5-2", - "018-5-3", - "018-5-4", - "018-5-5", - "018-5-boss", - "018-5", - "018-6-0", - "018-6-1", - "018-6-2", - "018-6-3", - "018-7-1", - "018-7", - "019-1-1", - "019-1", - "019-2", - "019-3", - "019-4-1", - "019-4", - "019-5-1", - "019-5-2", - "019-5-3", - "019-5", - "019-6", - "020-1", - "020-2", - "020-3", - "020-4", - "020-5", - "020-6", - "020-7-1", - "020-7-2", - "020-7", - "021-0", - "021-1", - "021-2", - "021-3", - "021-4", - "022-1", - "023-1", - "023-2", - "023-3-1", - "023-3-2", - "023-3", - "023-4", - "024-1", - "024-10", - "024-11", - "024-12", - "024-13", - "024-14", - "024-15", - "024-16", - "024-2", - "024-3", - "024-4", - "024-5", - "024-6", - "024-7", - "024-8", - "024-9", - "025-1", - "025-2-1", - "025-2-2", - "025-2-3", - "025-2-4", - "025-2", - "025-3", - "026-0", - "026-1", - "026-2", - "027-0", - "027-1", - "027-2", - "027-3", - "027-4", - "027-5", - "027-6", - "027-7", - "029-0", - "029-1", - "029-2", - "029-3", - "029-4", - "029-5", - "029-6", - "029-7", - "029-8", - "029-9", "030-01", "030-02", "030-03", @@ -380,38 +118,16 @@ map_list: ( "031-7", "031-8", "031-9", - "032-1", - "032-2", - "032-3", - "032-4", - "032-5", "033-1", "033-2", "033-3", "033-4", "033-5", - "034-1", - "034-2", - "034-3", - "034-4", - "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", + "fermi", "guilds", "sec_pri", - "soren-2", - "soren", "test", "testbg", ) diff --git a/db/map_index.txt b/db/map_index.txt index bc2a1c8..bded2e8 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -1,413 +1,129 @@ -000-0-0 1 -000-0-1 2 -000-0 3 -000-1 4 -001-1 5 -001-10-1 6 -001-10 7 -001-11 8 -001-12 9 -001-13-0 10 -001-13-1 11 -001-13-2 12 -001-13 13 -001-14 14 -001-2 15 -001-3-1 16 -001-3 17 -001-4 18 -001-5 19 -001-6 20 -001-7 21 -001-8 22 -001-9 23 -002-1 24 -002-2 25 -002-3 26 -002-4 27 -002-5 28 -003-0-1 29 -003-0-2 30 -003-0 31 -003-1-1 32 -003-1-2 33 -003-1-3 34 -003-1 35 -003-10 36 -003-13 37 -003-2-1 38 -003-2 39 -003-3 40 -003-4-1 41 -003-4 42 -003-5 43 -003-6 44 -003-7 45 -003-8 46 -003-9-1 47 -003-9 48 -004-1 49 -004-2-1 50 -004-2-10 51 -004-2-11 52 -004-2-12 53 -004-2-2 54 -004-2-3 55 -004-2-4 56 -004-2-5 57 -004-2-6 58 -004-2-7 59 -004-2-8 60 -004-2-9 61 -004-2 62 -004-3-1 63 -004-3-2 64 -004-3-3 65 -004-3-4 66 -004-3-5 67 -004-3-6 68 -004-3 69 -005-1-1 70 -005-1 71 -005-2-1 72 -005-2 73 -005-3 74 -005-4 75 -005-5 76 -005-6 77 -005-7 78 -006-0 79 -006-1 80 -006-10 81 -006-2-1 82 -006-2-2 83 -006-2-3 84 -006-2-4 85 -006-2-5 86 -006-2-6 87 -006-2 88 -006-3 89 -006-4-1 90 -006-4 91 -006-5 92 -006-6 93 -006-7 94 -006-8 95 -006-9 96 -007-1-1 97 -007-1-2 98 -007-1 99 -007-2 100 -008-0 101 -008-1 102 -008-2 103 -009-1 104 -009-2 105 -009-3 106 -009-4 107 -009-5 108 -009-6 109 -009-7 110 -010-1-1 111 -010-1-10 112 -010-1-11 113 -010-1-12 114 -010-1-2 115 -010-1-3 116 -010-1-4 117 -010-1-5 118 -010-1-6 119 -010-1-7 120 -010-1-8 121 -010-1-9 122 -010-1 123 -010-2-10 124 -010-2-11 125 -010-2-12 126 -010-2-13 127 -010-2-14 128 -010-2-15 129 -010-2-16 130 -010-2-2 131 -010-2-3 132 -010-2-4 133 -010-2-5 134 -010-2-6 135 -010-2-7 136 -010-2-8 137 -010-2-9 138 -010-2 139 -010-3 140 -010-4-1 141 -010-4-2 142 -011-1 143 -011-2 144 -011-3 145 -012-1 146 -012-2 147 -012-3 148 -012-4 149 -012-5 150 -012-6 151 -012-7 152 -012-8 153 -013-1 154 -014-1 155 -014-2-1 156 -014-2-2 157 -014-2 158 -014-3 159 -014-4 160 -014-5-1 161 -014-5 162 -015-1 163 -015-2 164 -015-3-1 165 -015-3-2 166 -015-3-3 167 -015-3 168 -015-4 169 -015-5 170 -015-6 171 -015-7 172 -015-8-1 173 -015-8 174 -016-1 175 -016-6 176 -016-7 177 -017-0 178 -017-1 179 -017-10 180 -017-2-1 181 -017-2-2 182 -017-2 183 -017-3 184 -017-4 185 -017-5 186 -017-6 187 -017-7 188 -017-8 189 -018-1-1 190 -018-1 191 -018-2-1 192 -018-2-2 193 -018-2-3 194 -018-2-4 195 -018-2-5 196 -018-2-6 197 -018-2-7 198 -018-2-8 199 -018-2 200 -018-3 201 -018-4-1 202 -018-4-2 203 -018-4 204 -018-5-0 205 -018-5-1 206 -018-5-2 207 -018-5-3 208 -018-5-4 209 -018-5-5 210 -018-5-boss 211 -018-5 212 -018-6-0 213 -018-6-1 214 -018-6-2 215 -018-6-3 216 -018-7-1 217 -018-7 218 -019-1-1 219 -019-1 220 -019-2 221 -019-3 222 -019-4-1 223 -019-4 224 -019-5-1 225 -019-5-2 226 -019-5-3 227 -019-5 228 -019-6 229 -020-1 230 -020-2 231 -020-3 232 -020-4 233 -020-5 234 -020-6 235 -020-7-1 236 -020-7-2 237 -020-7 238 -021-0 239 -021-1 240 -021-2 241 -021-3 242 -021-4 243 -022-1 244 -023-1 245 -023-2 246 -023-3-1 247 -023-3-2 248 -023-3 249 -023-4 250 -024-1 251 -024-10 252 -024-11 253 -024-12 254 -024-13 255 -024-14 256 -024-15 257 -024-16 258 -024-2 259 -024-3 260 -024-4 261 -024-5 262 -024-6 263 -024-7 264 -024-8 265 -024-9 266 -025-1 267 -025-2-1 268 -025-2-2 269 -025-2-3 270 -025-2-4 271 -025-2 272 -025-3 273 -026-0 274 -026-1 275 -026-2 276 -027-0 277 -027-1 278 -027-2 279 -027-3 280 -027-4 281 -027-5 282 -027-6 283 -027-7 284 -029-0 285 -029-1 286 -029-2 287 -029-3 288 -029-4 289 -029-5 290 -029-6 291 -029-7 292 -029-8 293 -029-9 294 -030-01 295 -030-02 296 -030-03 297 -030-04 298 -030-05 299 -030-06 300 -030-07 301 -030-08 302 -030-09 303 -030-10 304 -030-11 305 -030-12 306 -030-13 307 -030-14 308 -030-15 309 -030-16 310 -030-17 311 -030-18 312 -030-19 313 -030-20 314 -030-21 315 -030-22 316 -030-23 317 -030-24 318 -030-25 319 -030-26 320 -030-27 321 -030-28 322 -030-29 323 -030-30 324 -030-31 325 -030-32 326 -030-33 327 -030-34 328 -030-35 329 -030-36 330 -030-37 331 -030-38 332 -030-39 333 -030-40 334 -030-41 335 -030-42 336 -030-43 337 -030-44 338 -030-45 339 -030-46 340 -030-47 341 -030-48 342 -030-49 343 -030-50 344 -030-51 345 -030-52 346 -030-53 347 -030-54 348 -030-55 349 -030-56 350 -030-57 351 -030-58 352 -030-59 353 -030-60 354 -030-61 355 -030-62 356 -030-63 357 -030-64 358 -030-65 359 -030-66 360 -030-67 361 -030-68 362 -030-69 363 -030-70 364 -030-71 365 -030-72 366 -030-73 367 -030-74 368 -030-75 369 -031-0 370 -031-1 371 -031-2 372 -031-3 373 -031-4 374 -031-5 375 -031-6 376 -031-7 377 -031-8 378 -031-9 379 -032-1 380 -032-2 381 -032-3 382 -032-4 383 -032-5 384 -033-1 385 -033-2 386 -033-3 387 -033-4 388 -033-5 389 -034-1 390 -034-2 391 -034-3 392 -034-4 393 -042-0 394 -042-1 395 -042-10 396 -042-11 397 -042-2 398 -042-3 399 -042-4 400 -042-5 401 -042-6 402 -042-7 403 -042-8 404 -042-9 405 -boss 406 -botcheck 407 -guilds 408 -sec_pri 409 -soren-2 410 -soren 411 -test 412 -testbg 413 +000-0 1 +000-1 2 +001-10-1 3 +001-10 4 +001-11 5 +001-12 6 +001-13-0 7 +001-13-1 8 +001-13-2 9 +001-13 10 +001-14 11 +001-2 12 +001-3 13 +001-4 14 +001-8 15 +001-9 16 +003-3 17 +006-1 18 +006-4-1 19 +006-4 20 +006-5 21 +006-7 22 +006-8 23 +006-9 24 +011-1 25 +017-2-2 26 +018-2-1 27 +018-2-5 28 +018-2-6 29 +018-2-7 30 +018-2-8 31 +018-2 32 +030-01 33 +030-02 34 +030-03 35 +030-04 36 +030-05 37 +030-06 38 +030-07 39 +030-08 40 +030-09 41 +030-10 42 +030-11 43 +030-12 44 +030-13 45 +030-14 46 +030-15 47 +030-16 48 +030-17 49 +030-18 50 +030-19 51 +030-20 52 +030-21 53 +030-22 54 +030-23 55 +030-24 56 +030-25 57 +030-26 58 +030-27 59 +030-28 60 +030-29 61 +030-30 62 +030-31 63 +030-32 64 +030-33 65 +030-34 66 +030-35 67 +030-36 68 +030-37 69 +030-38 70 +030-39 71 +030-40 72 +030-41 73 +030-42 74 +030-43 75 +030-44 76 +030-45 77 +030-46 78 +030-47 79 +030-48 80 +030-49 81 +030-50 82 +030-51 83 +030-52 84 +030-53 85 +030-54 86 +030-55 87 +030-56 88 +030-57 89 +030-58 90 +030-59 91 +030-60 92 +030-61 93 +030-62 94 +030-63 95 +030-64 96 +030-65 97 +030-66 98 +030-67 99 +030-68 100 +030-69 101 +030-70 102 +030-71 103 +030-72 104 +030-73 105 +030-74 106 +030-75 107 +031-0 108 +031-1 109 +031-2 110 +031-3 111 +031-4 112 +031-5 113 +031-6 114 +031-7 115 +031-8 116 +031-9 117 +033-1 118 +033-2 119 +033-3 120 +033-4 121 +033-5 122 +boss 123 +botcheck 124 +fermi 125 +guilds 126 +sec_pri 127 +test 128 +testbg 129 diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf index a19d523..1a284ba 100644 --- a/db/re/map_zone_db.conf +++ b/db/re/map_zone_db.conf @@ -617,79 +617,6 @@ zones: ( SC_DIMENSIONDOOR: "PLAYER" } }, -{ - /* SuperMMO Zone is not the place for GMs to mess with - Fortress Island */ - name: "SuperMMO" - - disabled_skills: { - AL_WARP: "ALL" - AL_TELEPORT: "ALL" - WE_CALLPARTNER: "ALL" - WE_CALLPARENT: "ALL" - WE_CALLBABY: "ALL" - SC_DIMENSIONDOOR: "ALL" - GD_EMERGENCYCALL: "ALL" - } - - disabled_items: { - TimeFlask: true - CandorWarpCrystal: true - TulimWarpCrystal: true - HalinWarpCrystal: true - HurnsWarpCrystal: true - LoFWarpCrystal: true - NivalWarpCrystal: true - FrostiaWarpCrystal: true - LilitWarpCrystal: true - ArtisWarpCrystal: true - ReturnPotion: true - DeathPotion: true - } - - mapflags: ( - "nowarpto", - "bexp 125", - "nosave 025-2,100,27", - ) - - /* "command:min-group-lv-to-override" e.g. "heal: 70" */ - disabled_commands: { - recall: 100 - recallall: 100 - monster: 100 - item: 100 - summon: 100 - killer: 100 - killable: 100 - pvpon: 100 - pvpoff: 100 - clone: 100 - slaveclone: 100 - evilclone: 100 - monstersmall: 100 - monsterbig: 100 - save: 100 - killmonster: 100 - killmonster2: 100 - raisemap: 100 - doommap: 100 - kill: 100 - nuke: 100 - //revive: 100 - setbattleflag: 100 - cvcon: 100 - cvcoff: 100 - addwarp: 100 - mapflag: 100 - gvgon: 100 - gvgoff: 100 - skillon: 100 - skilloff: 100 - alive: 100 - } - skill_damage_cap: { - } -}, { name: "Towns" diff --git a/maps/re/000-0-0.mcache b/maps/re/000-0-0.mcache deleted file mode 100644 index ad91f87..0000000 Binary files a/maps/re/000-0-0.mcache and /dev/null differ diff --git a/maps/re/000-0-1.mcache b/maps/re/000-0-1.mcache deleted file mode 100644 index f3a038b..0000000 Binary files a/maps/re/000-0-1.mcache and /dev/null differ diff --git a/maps/re/000-0.mcache b/maps/re/000-0.mcache index 7632bac..bfaa8e8 100644 Binary files a/maps/re/000-0.mcache and b/maps/re/000-0.mcache differ diff --git a/maps/re/001-1.mcache b/maps/re/001-1.mcache deleted file mode 100644 index e8a508b..0000000 Binary files a/maps/re/001-1.mcache and /dev/null differ diff --git a/maps/re/001-3-1.mcache b/maps/re/001-3-1.mcache deleted file mode 100644 index 0ac55e4..0000000 Binary files a/maps/re/001-3-1.mcache and /dev/null differ diff --git a/maps/re/001-3.mcache b/maps/re/001-3.mcache index 946bbf0..962144b 100644 Binary files a/maps/re/001-3.mcache and b/maps/re/001-3.mcache differ diff --git a/maps/re/001-5.mcache b/maps/re/001-5.mcache deleted file mode 100644 index cc75d52..0000000 Binary files a/maps/re/001-5.mcache and /dev/null differ diff --git a/maps/re/001-6.mcache b/maps/re/001-6.mcache deleted file mode 100644 index 8189bce..0000000 Binary files a/maps/re/001-6.mcache and /dev/null differ diff --git a/maps/re/001-7.mcache b/maps/re/001-7.mcache deleted file mode 100644 index cc91797..0000000 Binary files a/maps/re/001-7.mcache and /dev/null differ diff --git a/maps/re/002-1.mcache b/maps/re/002-1.mcache deleted file mode 100644 index 6bc48c8..0000000 Binary files a/maps/re/002-1.mcache and /dev/null differ diff --git a/maps/re/002-2.mcache b/maps/re/002-2.mcache deleted file mode 100644 index 2ad8471..0000000 Binary files a/maps/re/002-2.mcache and /dev/null differ diff --git a/maps/re/002-3.mcache b/maps/re/002-3.mcache deleted file mode 100644 index 82d296d..0000000 Binary files a/maps/re/002-3.mcache and /dev/null differ diff --git a/maps/re/002-4.mcache b/maps/re/002-4.mcache deleted file mode 100644 index fc96a0d..0000000 Binary files a/maps/re/002-4.mcache and /dev/null differ diff --git a/maps/re/002-5.mcache b/maps/re/002-5.mcache deleted file mode 100644 index b6d0ae2..0000000 Binary files a/maps/re/002-5.mcache and /dev/null differ diff --git a/maps/re/003-0-1.mcache b/maps/re/003-0-1.mcache deleted file mode 100644 index c76805e..0000000 Binary files a/maps/re/003-0-1.mcache and /dev/null differ diff --git a/maps/re/003-0-2.mcache b/maps/re/003-0-2.mcache deleted file mode 100644 index 4ad6d60..0000000 Binary files a/maps/re/003-0-2.mcache and /dev/null differ diff --git a/maps/re/003-0.mcache b/maps/re/003-0.mcache deleted file mode 100644 index 74e42bd..0000000 Binary files a/maps/re/003-0.mcache and /dev/null differ diff --git a/maps/re/003-1-1.mcache b/maps/re/003-1-1.mcache deleted file mode 100644 index 86b7d66..0000000 Binary files a/maps/re/003-1-1.mcache and /dev/null differ diff --git a/maps/re/003-1-2.mcache b/maps/re/003-1-2.mcache deleted file mode 100644 index 9513d47..0000000 Binary files a/maps/re/003-1-2.mcache and /dev/null differ diff --git a/maps/re/003-1-3.mcache b/maps/re/003-1-3.mcache deleted file mode 100644 index d077610..0000000 Binary files a/maps/re/003-1-3.mcache and /dev/null differ diff --git a/maps/re/003-1.mcache b/maps/re/003-1.mcache deleted file mode 100644 index 7535303..0000000 Binary files a/maps/re/003-1.mcache and /dev/null differ diff --git a/maps/re/003-10.mcache b/maps/re/003-10.mcache deleted file mode 100644 index 3e9d065..0000000 Binary files a/maps/re/003-10.mcache and /dev/null differ diff --git a/maps/re/003-13.mcache b/maps/re/003-13.mcache deleted file mode 100644 index 0a93def..0000000 Binary files a/maps/re/003-13.mcache and /dev/null differ diff --git a/maps/re/003-2-1.mcache b/maps/re/003-2-1.mcache deleted file mode 100644 index f7deec5..0000000 Binary files a/maps/re/003-2-1.mcache and /dev/null differ diff --git a/maps/re/003-2.mcache b/maps/re/003-2.mcache deleted file mode 100644 index 1378af6..0000000 Binary files a/maps/re/003-2.mcache and /dev/null differ diff --git a/maps/re/003-4-1.mcache b/maps/re/003-4-1.mcache deleted file mode 100644 index 06d3b09..0000000 Binary files a/maps/re/003-4-1.mcache and /dev/null differ diff --git a/maps/re/003-4.mcache b/maps/re/003-4.mcache deleted file mode 100644 index fb9a8ce..0000000 Binary files a/maps/re/003-4.mcache and /dev/null differ diff --git a/maps/re/003-5.mcache b/maps/re/003-5.mcache deleted file mode 100644 index 4b53bd4..0000000 Binary files a/maps/re/003-5.mcache and /dev/null differ diff --git a/maps/re/003-6.mcache b/maps/re/003-6.mcache deleted file mode 100644 index fca97e4..0000000 Binary files a/maps/re/003-6.mcache and /dev/null differ diff --git a/maps/re/003-7.mcache b/maps/re/003-7.mcache deleted file mode 100644 index 6a5999f..0000000 Binary files a/maps/re/003-7.mcache and /dev/null differ diff --git a/maps/re/003-8.mcache b/maps/re/003-8.mcache deleted file mode 100644 index c537044..0000000 Binary files a/maps/re/003-8.mcache and /dev/null differ diff --git a/maps/re/003-9-1.mcache b/maps/re/003-9-1.mcache deleted file mode 100644 index 0848c07..0000000 Binary files a/maps/re/003-9-1.mcache and /dev/null differ diff --git a/maps/re/003-9.mcache b/maps/re/003-9.mcache deleted file mode 100644 index 9f9dd37..0000000 Binary files a/maps/re/003-9.mcache and /dev/null differ diff --git a/maps/re/004-1.mcache b/maps/re/004-1.mcache deleted file mode 100644 index 2a3f534..0000000 Binary files a/maps/re/004-1.mcache and /dev/null differ diff --git a/maps/re/004-2-1.mcache b/maps/re/004-2-1.mcache deleted file mode 100644 index fe59c51..0000000 Binary files a/maps/re/004-2-1.mcache and /dev/null differ diff --git a/maps/re/004-2-10.mcache b/maps/re/004-2-10.mcache deleted file mode 100644 index 0912116..0000000 Binary files a/maps/re/004-2-10.mcache and /dev/null differ diff --git a/maps/re/004-2-11.mcache b/maps/re/004-2-11.mcache deleted file mode 100644 index aff7f47..0000000 Binary files a/maps/re/004-2-11.mcache and /dev/null differ diff --git a/maps/re/004-2-12.mcache b/maps/re/004-2-12.mcache deleted file mode 100644 index fce68fd..0000000 Binary files a/maps/re/004-2-12.mcache and /dev/null differ diff --git a/maps/re/004-2-2.mcache b/maps/re/004-2-2.mcache deleted file mode 100644 index ccd72c1..0000000 Binary files a/maps/re/004-2-2.mcache and /dev/null differ diff --git a/maps/re/004-2-3.mcache b/maps/re/004-2-3.mcache deleted file mode 100644 index 94f99aa..0000000 Binary files a/maps/re/004-2-3.mcache and /dev/null differ diff --git a/maps/re/004-2-4.mcache b/maps/re/004-2-4.mcache deleted file mode 100644 index de6ffc1..0000000 Binary files a/maps/re/004-2-4.mcache and /dev/null differ diff --git a/maps/re/004-2-5.mcache b/maps/re/004-2-5.mcache deleted file mode 100644 index 9490a1a..0000000 Binary files a/maps/re/004-2-5.mcache and /dev/null differ diff --git a/maps/re/004-2-6.mcache b/maps/re/004-2-6.mcache deleted file mode 100644 index 80ce148..0000000 Binary files a/maps/re/004-2-6.mcache and /dev/null differ diff --git a/maps/re/004-2-7.mcache b/maps/re/004-2-7.mcache deleted file mode 100644 index bd54d9c..0000000 Binary files a/maps/re/004-2-7.mcache and /dev/null differ diff --git a/maps/re/004-2-8.mcache b/maps/re/004-2-8.mcache deleted file mode 100644 index 748c459..0000000 Binary files a/maps/re/004-2-8.mcache and /dev/null differ diff --git a/maps/re/004-2-9.mcache b/maps/re/004-2-9.mcache deleted file mode 100644 index fe91743..0000000 Binary files a/maps/re/004-2-9.mcache and /dev/null differ diff --git a/maps/re/004-2.mcache b/maps/re/004-2.mcache deleted file mode 100644 index 9814929..0000000 Binary files a/maps/re/004-2.mcache and /dev/null differ diff --git a/maps/re/004-3-1.mcache b/maps/re/004-3-1.mcache deleted file mode 100644 index 3dc5b8d..0000000 Binary files a/maps/re/004-3-1.mcache and /dev/null differ diff --git a/maps/re/004-3-2.mcache b/maps/re/004-3-2.mcache deleted file mode 100644 index 8bb6065..0000000 Binary files a/maps/re/004-3-2.mcache and /dev/null differ diff --git a/maps/re/004-3-3.mcache b/maps/re/004-3-3.mcache deleted file mode 100644 index 52f904f..0000000 Binary files a/maps/re/004-3-3.mcache and /dev/null differ diff --git a/maps/re/004-3-4.mcache b/maps/re/004-3-4.mcache deleted file mode 100644 index a5b7fed..0000000 Binary files a/maps/re/004-3-4.mcache and /dev/null differ diff --git a/maps/re/004-3-5.mcache b/maps/re/004-3-5.mcache deleted file mode 100644 index 49a8e77..0000000 Binary files a/maps/re/004-3-5.mcache and /dev/null differ diff --git a/maps/re/004-3-6.mcache b/maps/re/004-3-6.mcache deleted file mode 100644 index 1ab8e51..0000000 Binary files a/maps/re/004-3-6.mcache and /dev/null differ diff --git a/maps/re/004-3.mcache b/maps/re/004-3.mcache deleted file mode 100644 index ad4bd5b..0000000 Binary files a/maps/re/004-3.mcache and /dev/null differ diff --git a/maps/re/005-1-1.mcache b/maps/re/005-1-1.mcache deleted file mode 100644 index d0cb39f..0000000 Binary files a/maps/re/005-1-1.mcache and /dev/null differ diff --git a/maps/re/005-1.mcache b/maps/re/005-1.mcache deleted file mode 100644 index 37b110b..0000000 Binary files a/maps/re/005-1.mcache and /dev/null differ diff --git a/maps/re/005-2-1.mcache b/maps/re/005-2-1.mcache deleted file mode 100644 index 56744e7..0000000 Binary files a/maps/re/005-2-1.mcache and /dev/null differ diff --git a/maps/re/005-2.mcache b/maps/re/005-2.mcache deleted file mode 100644 index 7650f52..0000000 Binary files a/maps/re/005-2.mcache and /dev/null differ diff --git a/maps/re/005-3.mcache b/maps/re/005-3.mcache deleted file mode 100644 index 84ff456..0000000 Binary files a/maps/re/005-3.mcache and /dev/null differ diff --git a/maps/re/005-4.mcache b/maps/re/005-4.mcache deleted file mode 100644 index 9f609f0..0000000 Binary files a/maps/re/005-4.mcache and /dev/null differ diff --git a/maps/re/005-5.mcache b/maps/re/005-5.mcache deleted file mode 100644 index b320621..0000000 Binary files a/maps/re/005-5.mcache and /dev/null differ diff --git a/maps/re/005-6.mcache b/maps/re/005-6.mcache deleted file mode 100644 index 3e6ea93..0000000 Binary files a/maps/re/005-6.mcache and /dev/null differ diff --git a/maps/re/005-7.mcache b/maps/re/005-7.mcache deleted file mode 100644 index 8ac1096..0000000 Binary files a/maps/re/005-7.mcache and /dev/null differ diff --git a/maps/re/006-0.mcache b/maps/re/006-0.mcache deleted file mode 100644 index ce04a29..0000000 Binary files a/maps/re/006-0.mcache and /dev/null differ diff --git a/maps/re/006-10.mcache b/maps/re/006-10.mcache deleted file mode 100644 index 86deb1c..0000000 Binary files a/maps/re/006-10.mcache and /dev/null differ diff --git a/maps/re/006-2-1.mcache b/maps/re/006-2-1.mcache deleted file mode 100644 index 7d07f7b..0000000 Binary files a/maps/re/006-2-1.mcache and /dev/null differ diff --git a/maps/re/006-2-2.mcache b/maps/re/006-2-2.mcache deleted file mode 100644 index 654dffe..0000000 Binary files a/maps/re/006-2-2.mcache and /dev/null differ diff --git a/maps/re/006-2-3.mcache b/maps/re/006-2-3.mcache deleted file mode 100644 index 4e06a70..0000000 Binary files a/maps/re/006-2-3.mcache and /dev/null differ diff --git a/maps/re/006-2-4.mcache b/maps/re/006-2-4.mcache deleted file mode 100644 index c22b215..0000000 Binary files a/maps/re/006-2-4.mcache and /dev/null differ diff --git a/maps/re/006-2-5.mcache b/maps/re/006-2-5.mcache deleted file mode 100644 index 743381a..0000000 Binary files a/maps/re/006-2-5.mcache and /dev/null differ diff --git a/maps/re/006-2-6.mcache b/maps/re/006-2-6.mcache deleted file mode 100644 index 61c2a73..0000000 Binary files a/maps/re/006-2-6.mcache and /dev/null differ diff --git a/maps/re/006-2.mcache b/maps/re/006-2.mcache deleted file mode 100644 index 512cea7..0000000 Binary files a/maps/re/006-2.mcache and /dev/null differ diff --git a/maps/re/006-3.mcache b/maps/re/006-3.mcache deleted file mode 100644 index 3dbbb80..0000000 Binary files a/maps/re/006-3.mcache and /dev/null differ diff --git a/maps/re/006-6.mcache b/maps/re/006-6.mcache deleted file mode 100644 index a205e64..0000000 Binary files a/maps/re/006-6.mcache and /dev/null differ diff --git a/maps/re/007-1-1.mcache b/maps/re/007-1-1.mcache deleted file mode 100644 index 5e1698a..0000000 Binary files a/maps/re/007-1-1.mcache and /dev/null differ diff --git a/maps/re/007-1-2.mcache b/maps/re/007-1-2.mcache deleted file mode 100644 index fb7a104..0000000 Binary files a/maps/re/007-1-2.mcache and /dev/null differ diff --git a/maps/re/007-1.mcache b/maps/re/007-1.mcache deleted file mode 100644 index ba38a8a..0000000 Binary files a/maps/re/007-1.mcache and /dev/null differ diff --git a/maps/re/007-2.mcache b/maps/re/007-2.mcache deleted file mode 100644 index bcb09ae..0000000 Binary files a/maps/re/007-2.mcache and /dev/null differ diff --git a/maps/re/008-0.mcache b/maps/re/008-0.mcache deleted file mode 100644 index 5c6c915..0000000 Binary files a/maps/re/008-0.mcache and /dev/null differ diff --git a/maps/re/008-1.mcache b/maps/re/008-1.mcache deleted file mode 100644 index c3e87da..0000000 Binary files a/maps/re/008-1.mcache and /dev/null differ diff --git a/maps/re/008-2.mcache b/maps/re/008-2.mcache deleted file mode 100644 index e0c879c..0000000 Binary files a/maps/re/008-2.mcache and /dev/null differ diff --git a/maps/re/009-1.mcache b/maps/re/009-1.mcache deleted file mode 100644 index 4bf5221..0000000 Binary files a/maps/re/009-1.mcache and /dev/null differ diff --git a/maps/re/009-2.mcache b/maps/re/009-2.mcache deleted file mode 100644 index 3b5f0bb..0000000 Binary files a/maps/re/009-2.mcache and /dev/null differ diff --git a/maps/re/009-3.mcache b/maps/re/009-3.mcache deleted file mode 100644 index 0e6c88a..0000000 Binary files a/maps/re/009-3.mcache and /dev/null differ diff --git a/maps/re/009-4.mcache b/maps/re/009-4.mcache deleted file mode 100644 index f06a1a9..0000000 Binary files a/maps/re/009-4.mcache and /dev/null differ diff --git a/maps/re/009-5.mcache b/maps/re/009-5.mcache deleted file mode 100644 index d492dc7..0000000 Binary files a/maps/re/009-5.mcache and /dev/null differ diff --git a/maps/re/009-6.mcache b/maps/re/009-6.mcache deleted file mode 100644 index 2cae43c..0000000 Binary files a/maps/re/009-6.mcache and /dev/null differ diff --git a/maps/re/009-7.mcache b/maps/re/009-7.mcache deleted file mode 100644 index 2cae43c..0000000 Binary files a/maps/re/009-7.mcache and /dev/null differ diff --git a/maps/re/010-1-1.mcache b/maps/re/010-1-1.mcache deleted file mode 100644 index 7dca28b..0000000 Binary files a/maps/re/010-1-1.mcache and /dev/null differ diff --git a/maps/re/010-1-10.mcache b/maps/re/010-1-10.mcache deleted file mode 100644 index b4e57d7..0000000 Binary files a/maps/re/010-1-10.mcache and /dev/null differ diff --git a/maps/re/010-1-11.mcache b/maps/re/010-1-11.mcache deleted file mode 100644 index 31586d2..0000000 Binary files a/maps/re/010-1-11.mcache and /dev/null differ diff --git a/maps/re/010-1-12.mcache b/maps/re/010-1-12.mcache deleted file mode 100644 index 07724b4..0000000 Binary files a/maps/re/010-1-12.mcache and /dev/null differ diff --git a/maps/re/010-1-2.mcache b/maps/re/010-1-2.mcache deleted file mode 100644 index 8aa03e1..0000000 Binary files a/maps/re/010-1-2.mcache and /dev/null differ diff --git a/maps/re/010-1-3.mcache b/maps/re/010-1-3.mcache deleted file mode 100644 index 921063a..0000000 Binary files a/maps/re/010-1-3.mcache and /dev/null differ diff --git a/maps/re/010-1-4.mcache b/maps/re/010-1-4.mcache deleted file mode 100644 index ccd33c0..0000000 Binary files a/maps/re/010-1-4.mcache and /dev/null differ diff --git a/maps/re/010-1-5.mcache b/maps/re/010-1-5.mcache deleted file mode 100644 index f64ed80..0000000 Binary files a/maps/re/010-1-5.mcache and /dev/null differ diff --git a/maps/re/010-1-6.mcache b/maps/re/010-1-6.mcache deleted file mode 100644 index 5bd9a2d..0000000 Binary files a/maps/re/010-1-6.mcache and /dev/null differ diff --git a/maps/re/010-1-7.mcache b/maps/re/010-1-7.mcache deleted file mode 100644 index 4fddbf4..0000000 Binary files a/maps/re/010-1-7.mcache and /dev/null differ diff --git a/maps/re/010-1-8.mcache b/maps/re/010-1-8.mcache deleted file mode 100644 index e6dcc49..0000000 Binary files a/maps/re/010-1-8.mcache and /dev/null differ diff --git a/maps/re/010-1-9.mcache b/maps/re/010-1-9.mcache deleted file mode 100644 index f06200c..0000000 Binary files a/maps/re/010-1-9.mcache and /dev/null differ diff --git a/maps/re/010-1.mcache b/maps/re/010-1.mcache deleted file mode 100644 index d7f63d0..0000000 Binary files a/maps/re/010-1.mcache and /dev/null differ diff --git a/maps/re/010-2-10.mcache b/maps/re/010-2-10.mcache deleted file mode 100644 index cf8fff4..0000000 Binary files a/maps/re/010-2-10.mcache and /dev/null differ diff --git a/maps/re/010-2-11.mcache b/maps/re/010-2-11.mcache deleted file mode 100644 index 512e984..0000000 Binary files a/maps/re/010-2-11.mcache and /dev/null differ diff --git a/maps/re/010-2-12.mcache b/maps/re/010-2-12.mcache deleted file mode 100644 index e8cfadf..0000000 Binary files a/maps/re/010-2-12.mcache and /dev/null differ diff --git a/maps/re/010-2-13.mcache b/maps/re/010-2-13.mcache deleted file mode 100644 index 852da02..0000000 Binary files a/maps/re/010-2-13.mcache and /dev/null differ diff --git a/maps/re/010-2-14.mcache b/maps/re/010-2-14.mcache deleted file mode 100644 index f4dffc9..0000000 Binary files a/maps/re/010-2-14.mcache and /dev/null differ diff --git a/maps/re/010-2-15.mcache b/maps/re/010-2-15.mcache deleted file mode 100644 index be3efcd..0000000 Binary files a/maps/re/010-2-15.mcache and /dev/null differ diff --git a/maps/re/010-2-16.mcache b/maps/re/010-2-16.mcache deleted file mode 100644 index 44786f8..0000000 Binary files a/maps/re/010-2-16.mcache and /dev/null differ diff --git a/maps/re/010-2-2.mcache b/maps/re/010-2-2.mcache deleted file mode 100644 index 2f288e6..0000000 Binary files a/maps/re/010-2-2.mcache and /dev/null differ diff --git a/maps/re/010-2-3.mcache b/maps/re/010-2-3.mcache deleted file mode 100644 index 80bae1e..0000000 Binary files a/maps/re/010-2-3.mcache and /dev/null differ diff --git a/maps/re/010-2-4.mcache b/maps/re/010-2-4.mcache deleted file mode 100644 index 3eb21e6..0000000 Binary files a/maps/re/010-2-4.mcache and /dev/null differ diff --git a/maps/re/010-2-5.mcache b/maps/re/010-2-5.mcache deleted file mode 100644 index b32969a..0000000 Binary files a/maps/re/010-2-5.mcache and /dev/null differ diff --git a/maps/re/010-2-6.mcache b/maps/re/010-2-6.mcache deleted file mode 100644 index d881681..0000000 Binary files a/maps/re/010-2-6.mcache and /dev/null differ diff --git a/maps/re/010-2-7.mcache b/maps/re/010-2-7.mcache deleted file mode 100644 index ef0c29b..0000000 Binary files a/maps/re/010-2-7.mcache and /dev/null differ diff --git a/maps/re/010-2-8.mcache b/maps/re/010-2-8.mcache deleted file mode 100644 index 68cb5cc..0000000 Binary files a/maps/re/010-2-8.mcache and /dev/null differ diff --git a/maps/re/010-2-9.mcache b/maps/re/010-2-9.mcache deleted file mode 100644 index 64c0a5c..0000000 Binary files a/maps/re/010-2-9.mcache and /dev/null differ diff --git a/maps/re/010-2.mcache b/maps/re/010-2.mcache deleted file mode 100644 index 00ddf6f..0000000 Binary files a/maps/re/010-2.mcache and /dev/null differ diff --git a/maps/re/010-3.mcache b/maps/re/010-3.mcache deleted file mode 100644 index 9088c72..0000000 Binary files a/maps/re/010-3.mcache and /dev/null differ diff --git a/maps/re/010-4-1.mcache b/maps/re/010-4-1.mcache deleted file mode 100644 index 9f9093c..0000000 Binary files a/maps/re/010-4-1.mcache and /dev/null differ diff --git a/maps/re/010-4-2.mcache b/maps/re/010-4-2.mcache deleted file mode 100644 index 141f08c..0000000 Binary files a/maps/re/010-4-2.mcache and /dev/null differ diff --git a/maps/re/011-2.mcache b/maps/re/011-2.mcache deleted file mode 100644 index 1b04c8e..0000000 Binary files a/maps/re/011-2.mcache and /dev/null differ diff --git a/maps/re/011-3.mcache b/maps/re/011-3.mcache deleted file mode 100644 index 91b7177..0000000 Binary files a/maps/re/011-3.mcache and /dev/null differ diff --git a/maps/re/012-1.mcache b/maps/re/012-1.mcache deleted file mode 100644 index aa2f66a..0000000 Binary files a/maps/re/012-1.mcache and /dev/null differ diff --git a/maps/re/012-2.mcache b/maps/re/012-2.mcache deleted file mode 100644 index abf7306..0000000 Binary files a/maps/re/012-2.mcache and /dev/null differ diff --git a/maps/re/012-3.mcache b/maps/re/012-3.mcache deleted file mode 100644 index 4c8c44a..0000000 Binary files a/maps/re/012-3.mcache and /dev/null differ diff --git a/maps/re/012-4.mcache b/maps/re/012-4.mcache deleted file mode 100644 index 400529d1..0000000 Binary files a/maps/re/012-4.mcache and /dev/null differ diff --git a/maps/re/012-5.mcache b/maps/re/012-5.mcache deleted file mode 100644 index 40b7c66..0000000 Binary files a/maps/re/012-5.mcache and /dev/null differ diff --git a/maps/re/012-6.mcache b/maps/re/012-6.mcache deleted file mode 100644 index 99416f9..0000000 Binary files a/maps/re/012-6.mcache and /dev/null differ diff --git a/maps/re/012-7.mcache b/maps/re/012-7.mcache deleted file mode 100644 index 7f6efc8..0000000 Binary files a/maps/re/012-7.mcache and /dev/null differ diff --git a/maps/re/012-8.mcache b/maps/re/012-8.mcache deleted file mode 100644 index 2cae43c..0000000 Binary files a/maps/re/012-8.mcache and /dev/null differ diff --git a/maps/re/013-1.mcache b/maps/re/013-1.mcache deleted file mode 100644 index d0bfa1d..0000000 Binary files a/maps/re/013-1.mcache and /dev/null differ diff --git a/maps/re/014-1.mcache b/maps/re/014-1.mcache deleted file mode 100644 index fccf8bd..0000000 Binary files a/maps/re/014-1.mcache and /dev/null differ diff --git a/maps/re/014-2-1.mcache b/maps/re/014-2-1.mcache deleted file mode 100644 index a832650..0000000 Binary files a/maps/re/014-2-1.mcache and /dev/null differ diff --git a/maps/re/014-2-2.mcache b/maps/re/014-2-2.mcache deleted file mode 100644 index 556275b..0000000 Binary files a/maps/re/014-2-2.mcache and /dev/null differ diff --git a/maps/re/014-2.mcache b/maps/re/014-2.mcache deleted file mode 100644 index fa7fd60..0000000 Binary files a/maps/re/014-2.mcache and /dev/null differ diff --git a/maps/re/014-3.mcache b/maps/re/014-3.mcache deleted file mode 100644 index c941491..0000000 Binary files a/maps/re/014-3.mcache and /dev/null differ diff --git a/maps/re/014-4.mcache b/maps/re/014-4.mcache deleted file mode 100644 index ae4e65b..0000000 Binary files a/maps/re/014-4.mcache and /dev/null differ diff --git a/maps/re/014-5-1.mcache b/maps/re/014-5-1.mcache deleted file mode 100644 index 3fe4db5..0000000 Binary files a/maps/re/014-5-1.mcache and /dev/null differ diff --git a/maps/re/014-5.mcache b/maps/re/014-5.mcache deleted file mode 100644 index 5404770..0000000 Binary files a/maps/re/014-5.mcache and /dev/null differ diff --git a/maps/re/015-1.mcache b/maps/re/015-1.mcache deleted file mode 100644 index 62a2d72..0000000 Binary files a/maps/re/015-1.mcache and /dev/null differ diff --git a/maps/re/015-2.mcache b/maps/re/015-2.mcache deleted file mode 100644 index 152d254..0000000 Binary files a/maps/re/015-2.mcache and /dev/null differ diff --git a/maps/re/015-3-1.mcache b/maps/re/015-3-1.mcache deleted file mode 100644 index e895357..0000000 Binary files a/maps/re/015-3-1.mcache and /dev/null differ diff --git a/maps/re/015-3-2.mcache b/maps/re/015-3-2.mcache deleted file mode 100644 index 303c2d9..0000000 Binary files a/maps/re/015-3-2.mcache and /dev/null differ diff --git a/maps/re/015-3-3.mcache b/maps/re/015-3-3.mcache deleted file mode 100644 index 5749c29..0000000 Binary files a/maps/re/015-3-3.mcache and /dev/null differ diff --git a/maps/re/015-3.mcache b/maps/re/015-3.mcache deleted file mode 100644 index 4965044..0000000 Binary files a/maps/re/015-3.mcache and /dev/null differ diff --git a/maps/re/015-4.mcache b/maps/re/015-4.mcache deleted file mode 100644 index 17871a3..0000000 Binary files a/maps/re/015-4.mcache and /dev/null differ diff --git a/maps/re/015-5.mcache b/maps/re/015-5.mcache deleted file mode 100644 index f21cecc..0000000 Binary files a/maps/re/015-5.mcache and /dev/null differ diff --git a/maps/re/015-6.mcache b/maps/re/015-6.mcache deleted file mode 100644 index 0c67558..0000000 Binary files a/maps/re/015-6.mcache and /dev/null differ diff --git a/maps/re/015-7.mcache b/maps/re/015-7.mcache deleted file mode 100644 index e0c837a..0000000 Binary files a/maps/re/015-7.mcache and /dev/null differ diff --git a/maps/re/015-8-1.mcache b/maps/re/015-8-1.mcache deleted file mode 100644 index 0258d79..0000000 Binary files a/maps/re/015-8-1.mcache and /dev/null differ diff --git a/maps/re/015-8.mcache b/maps/re/015-8.mcache deleted file mode 100644 index e4cce21..0000000 Binary files a/maps/re/015-8.mcache and /dev/null differ diff --git a/maps/re/016-1.mcache b/maps/re/016-1.mcache deleted file mode 100644 index 304feb9..0000000 Binary files a/maps/re/016-1.mcache and /dev/null differ diff --git a/maps/re/016-6.mcache b/maps/re/016-6.mcache deleted file mode 100644 index b4eafa4..0000000 Binary files a/maps/re/016-6.mcache and /dev/null differ diff --git a/maps/re/016-7.mcache b/maps/re/016-7.mcache deleted file mode 100644 index 0e76cd1..0000000 Binary files a/maps/re/016-7.mcache and /dev/null differ diff --git a/maps/re/017-0.mcache b/maps/re/017-0.mcache deleted file mode 100644 index 089e2fb..0000000 Binary files a/maps/re/017-0.mcache and /dev/null differ diff --git a/maps/re/017-1.mcache b/maps/re/017-1.mcache deleted file mode 100644 index db14958..0000000 Binary files a/maps/re/017-1.mcache and /dev/null differ diff --git a/maps/re/017-10.mcache b/maps/re/017-10.mcache deleted file mode 100644 index 84c823e..0000000 Binary files a/maps/re/017-10.mcache and /dev/null differ diff --git a/maps/re/017-2-1.mcache b/maps/re/017-2-1.mcache deleted file mode 100644 index f75ff33..0000000 Binary files a/maps/re/017-2-1.mcache and /dev/null differ diff --git a/maps/re/017-2.mcache b/maps/re/017-2.mcache deleted file mode 100644 index fd55573..0000000 Binary files a/maps/re/017-2.mcache and /dev/null differ diff --git a/maps/re/017-3.mcache b/maps/re/017-3.mcache deleted file mode 100644 index 456310e..0000000 Binary files a/maps/re/017-3.mcache and /dev/null differ diff --git a/maps/re/017-4.mcache b/maps/re/017-4.mcache deleted file mode 100644 index 72beea6..0000000 Binary files a/maps/re/017-4.mcache and /dev/null differ diff --git a/maps/re/017-5.mcache b/maps/re/017-5.mcache deleted file mode 100644 index b57733b..0000000 Binary files a/maps/re/017-5.mcache and /dev/null differ diff --git a/maps/re/017-6.mcache b/maps/re/017-6.mcache deleted file mode 100644 index 4ea1a14..0000000 Binary files a/maps/re/017-6.mcache and /dev/null differ diff --git a/maps/re/017-7.mcache b/maps/re/017-7.mcache deleted file mode 100644 index 2cae43c..0000000 Binary files a/maps/re/017-7.mcache and /dev/null differ diff --git a/maps/re/017-8.mcache b/maps/re/017-8.mcache deleted file mode 100644 index 2cae43c..0000000 Binary files a/maps/re/017-8.mcache and /dev/null differ diff --git a/maps/re/018-1-1.mcache b/maps/re/018-1-1.mcache deleted file mode 100644 index 13d1cd7..0000000 Binary files a/maps/re/018-1-1.mcache and /dev/null differ diff --git a/maps/re/018-1.mcache b/maps/re/018-1.mcache deleted file mode 100644 index 5fd249b..0000000 Binary files a/maps/re/018-1.mcache and /dev/null differ diff --git a/maps/re/018-2-2.mcache b/maps/re/018-2-2.mcache deleted file mode 100644 index 0ba5e71..0000000 Binary files a/maps/re/018-2-2.mcache and /dev/null differ diff --git a/maps/re/018-2-3.mcache b/maps/re/018-2-3.mcache deleted file mode 100644 index 0ba5e71..0000000 Binary files a/maps/re/018-2-3.mcache and /dev/null differ diff --git a/maps/re/018-2-4.mcache b/maps/re/018-2-4.mcache deleted file mode 100644 index ba11231..0000000 Binary files a/maps/re/018-2-4.mcache and /dev/null differ diff --git a/maps/re/018-3.mcache b/maps/re/018-3.mcache deleted file mode 100644 index 57b538a..0000000 Binary files a/maps/re/018-3.mcache and /dev/null differ diff --git a/maps/re/018-4-1.mcache b/maps/re/018-4-1.mcache deleted file mode 100644 index 9616044..0000000 Binary files a/maps/re/018-4-1.mcache and /dev/null differ diff --git a/maps/re/018-4-2.mcache b/maps/re/018-4-2.mcache deleted file mode 100644 index 4dfc7d3..0000000 Binary files a/maps/re/018-4-2.mcache and /dev/null differ diff --git a/maps/re/018-4.mcache b/maps/re/018-4.mcache deleted file mode 100644 index b363d68..0000000 Binary files a/maps/re/018-4.mcache and /dev/null differ diff --git a/maps/re/018-5-0.mcache b/maps/re/018-5-0.mcache deleted file mode 100644 index 6c43408..0000000 Binary files a/maps/re/018-5-0.mcache and /dev/null differ diff --git a/maps/re/018-5-1.mcache b/maps/re/018-5-1.mcache deleted file mode 100644 index 56cab9f..0000000 Binary files a/maps/re/018-5-1.mcache and /dev/null differ diff --git a/maps/re/018-5-2.mcache b/maps/re/018-5-2.mcache deleted file mode 100644 index aed84bf..0000000 Binary files a/maps/re/018-5-2.mcache and /dev/null differ diff --git a/maps/re/018-5-3.mcache b/maps/re/018-5-3.mcache deleted file mode 100644 index 15187e5..0000000 Binary files a/maps/re/018-5-3.mcache and /dev/null differ diff --git a/maps/re/018-5-4.mcache b/maps/re/018-5-4.mcache deleted file mode 100644 index 01dffb4..0000000 Binary files a/maps/re/018-5-4.mcache and /dev/null differ diff --git a/maps/re/018-5-5.mcache b/maps/re/018-5-5.mcache deleted file mode 100644 index aaa4498..0000000 Binary files a/maps/re/018-5-5.mcache and /dev/null differ diff --git a/maps/re/018-5-boss.mcache b/maps/re/018-5-boss.mcache deleted file mode 100644 index 2ae0c48..0000000 Binary files a/maps/re/018-5-boss.mcache and /dev/null differ diff --git a/maps/re/018-5.mcache b/maps/re/018-5.mcache deleted file mode 100644 index 89e3339..0000000 Binary files a/maps/re/018-5.mcache and /dev/null differ diff --git a/maps/re/018-6-0.mcache b/maps/re/018-6-0.mcache deleted file mode 100644 index 72c87d4..0000000 Binary files a/maps/re/018-6-0.mcache and /dev/null differ diff --git a/maps/re/018-6-1.mcache b/maps/re/018-6-1.mcache deleted file mode 100644 index 0f208e0..0000000 Binary files a/maps/re/018-6-1.mcache and /dev/null differ diff --git a/maps/re/018-6-2.mcache b/maps/re/018-6-2.mcache deleted file mode 100644 index f72c6cf..0000000 Binary files a/maps/re/018-6-2.mcache and /dev/null differ diff --git a/maps/re/018-6-3.mcache b/maps/re/018-6-3.mcache deleted file mode 100644 index 13e1b53..0000000 Binary files a/maps/re/018-6-3.mcache and /dev/null differ diff --git a/maps/re/018-7-1.mcache b/maps/re/018-7-1.mcache deleted file mode 100644 index 09a32be..0000000 Binary files a/maps/re/018-7-1.mcache and /dev/null differ diff --git a/maps/re/018-7.mcache b/maps/re/018-7.mcache deleted file mode 100644 index 82e28b9..0000000 Binary files a/maps/re/018-7.mcache and /dev/null differ diff --git a/maps/re/019-1-1.mcache b/maps/re/019-1-1.mcache deleted file mode 100644 index 2d70a28..0000000 Binary files a/maps/re/019-1-1.mcache and /dev/null differ diff --git a/maps/re/019-1.mcache b/maps/re/019-1.mcache deleted file mode 100644 index 11187b3..0000000 Binary files a/maps/re/019-1.mcache and /dev/null differ diff --git a/maps/re/019-2.mcache b/maps/re/019-2.mcache deleted file mode 100644 index dbed9f8..0000000 Binary files a/maps/re/019-2.mcache and /dev/null differ diff --git a/maps/re/019-3.mcache b/maps/re/019-3.mcache deleted file mode 100644 index 6d18470..0000000 Binary files a/maps/re/019-3.mcache and /dev/null differ diff --git a/maps/re/019-4-1.mcache b/maps/re/019-4-1.mcache deleted file mode 100644 index 707a38e..0000000 Binary files a/maps/re/019-4-1.mcache and /dev/null differ diff --git a/maps/re/019-4.mcache b/maps/re/019-4.mcache deleted file mode 100644 index 7bf5ec5..0000000 Binary files a/maps/re/019-4.mcache and /dev/null differ diff --git a/maps/re/019-5-1.mcache b/maps/re/019-5-1.mcache deleted file mode 100644 index dace756..0000000 Binary files a/maps/re/019-5-1.mcache and /dev/null differ diff --git a/maps/re/019-5-2.mcache b/maps/re/019-5-2.mcache deleted file mode 100644 index 0647120..0000000 Binary files a/maps/re/019-5-2.mcache and /dev/null differ diff --git a/maps/re/019-5-3.mcache b/maps/re/019-5-3.mcache deleted file mode 100644 index 5ef13b8..0000000 Binary files a/maps/re/019-5-3.mcache and /dev/null differ diff --git a/maps/re/019-5.mcache b/maps/re/019-5.mcache deleted file mode 100644 index 6876a7c..0000000 Binary files a/maps/re/019-5.mcache and /dev/null differ diff --git a/maps/re/019-6.mcache b/maps/re/019-6.mcache deleted file mode 100644 index f361339..0000000 Binary files a/maps/re/019-6.mcache and /dev/null differ diff --git a/maps/re/020-1.mcache b/maps/re/020-1.mcache deleted file mode 100644 index 7d801ae..0000000 Binary files a/maps/re/020-1.mcache and /dev/null differ diff --git a/maps/re/020-2.mcache b/maps/re/020-2.mcache deleted file mode 100644 index c885e3f..0000000 Binary files a/maps/re/020-2.mcache and /dev/null differ diff --git a/maps/re/020-3.mcache b/maps/re/020-3.mcache deleted file mode 100644 index 2a901ed..0000000 Binary files a/maps/re/020-3.mcache and /dev/null differ diff --git a/maps/re/020-4.mcache b/maps/re/020-4.mcache deleted file mode 100644 index 6a27d9d..0000000 Binary files a/maps/re/020-4.mcache and /dev/null differ diff --git a/maps/re/020-5.mcache b/maps/re/020-5.mcache deleted file mode 100644 index f21c20e..0000000 Binary files a/maps/re/020-5.mcache and /dev/null differ diff --git a/maps/re/020-6.mcache b/maps/re/020-6.mcache deleted file mode 100644 index 801f801..0000000 Binary files a/maps/re/020-6.mcache and /dev/null differ diff --git a/maps/re/020-7-1.mcache b/maps/re/020-7-1.mcache deleted file mode 100644 index d20e681..0000000 Binary files a/maps/re/020-7-1.mcache and /dev/null differ diff --git a/maps/re/020-7-2.mcache b/maps/re/020-7-2.mcache deleted file mode 100644 index 27a1ec7..0000000 Binary files a/maps/re/020-7-2.mcache and /dev/null differ diff --git a/maps/re/020-7.mcache b/maps/re/020-7.mcache deleted file mode 100644 index 2697453..0000000 Binary files a/maps/re/020-7.mcache and /dev/null differ diff --git a/maps/re/021-0.mcache b/maps/re/021-0.mcache deleted file mode 100644 index 5576d35..0000000 Binary files a/maps/re/021-0.mcache and /dev/null differ diff --git a/maps/re/021-1.mcache b/maps/re/021-1.mcache deleted file mode 100644 index 5fbf6a5..0000000 Binary files a/maps/re/021-1.mcache and /dev/null differ diff --git a/maps/re/021-2.mcache b/maps/re/021-2.mcache deleted file mode 100644 index 8a45fb4..0000000 Binary files a/maps/re/021-2.mcache and /dev/null differ diff --git a/maps/re/021-3.mcache b/maps/re/021-3.mcache deleted file mode 100644 index 1274acf..0000000 Binary files a/maps/re/021-3.mcache and /dev/null differ diff --git a/maps/re/021-4.mcache b/maps/re/021-4.mcache deleted file mode 100644 index a06f8bc..0000000 Binary files a/maps/re/021-4.mcache and /dev/null differ diff --git a/maps/re/022-1.mcache b/maps/re/022-1.mcache deleted file mode 100644 index ac11360..0000000 Binary files a/maps/re/022-1.mcache and /dev/null differ diff --git a/maps/re/023-1.mcache b/maps/re/023-1.mcache deleted file mode 100644 index 3fe7c4f..0000000 Binary files a/maps/re/023-1.mcache and /dev/null differ diff --git a/maps/re/023-2.mcache b/maps/re/023-2.mcache deleted file mode 100644 index f8947d8..0000000 Binary files a/maps/re/023-2.mcache and /dev/null differ diff --git a/maps/re/023-3-1.mcache b/maps/re/023-3-1.mcache deleted file mode 100644 index 705f8d7..0000000 Binary files a/maps/re/023-3-1.mcache and /dev/null differ diff --git a/maps/re/023-3-2.mcache b/maps/re/023-3-2.mcache deleted file mode 100644 index 9748b93..0000000 Binary files a/maps/re/023-3-2.mcache and /dev/null differ diff --git a/maps/re/023-3.mcache b/maps/re/023-3.mcache deleted file mode 100644 index e0b9649..0000000 Binary files a/maps/re/023-3.mcache and /dev/null differ diff --git a/maps/re/023-4.mcache b/maps/re/023-4.mcache deleted file mode 100644 index e171a8a..0000000 Binary files a/maps/re/023-4.mcache and /dev/null differ diff --git a/maps/re/024-1.mcache b/maps/re/024-1.mcache deleted file mode 100644 index ceb89e8..0000000 Binary files a/maps/re/024-1.mcache and /dev/null differ diff --git a/maps/re/024-10.mcache b/maps/re/024-10.mcache deleted file mode 100644 index 5ff67f9..0000000 Binary files a/maps/re/024-10.mcache and /dev/null differ diff --git a/maps/re/024-11.mcache b/maps/re/024-11.mcache deleted file mode 100644 index 6be2b8b..0000000 Binary files a/maps/re/024-11.mcache and /dev/null differ diff --git a/maps/re/024-12.mcache b/maps/re/024-12.mcache deleted file mode 100644 index 2483dbe..0000000 Binary files a/maps/re/024-12.mcache and /dev/null differ diff --git a/maps/re/024-13.mcache b/maps/re/024-13.mcache deleted file mode 100644 index c824a75..0000000 Binary files a/maps/re/024-13.mcache and /dev/null differ diff --git a/maps/re/024-14.mcache b/maps/re/024-14.mcache deleted file mode 100644 index abdd1b7..0000000 Binary files a/maps/re/024-14.mcache and /dev/null differ diff --git a/maps/re/024-15.mcache b/maps/re/024-15.mcache deleted file mode 100644 index 8ac285e..0000000 Binary files a/maps/re/024-15.mcache and /dev/null differ diff --git a/maps/re/024-16.mcache b/maps/re/024-16.mcache deleted file mode 100644 index 708c05e..0000000 Binary files a/maps/re/024-16.mcache and /dev/null differ diff --git a/maps/re/024-2.mcache b/maps/re/024-2.mcache deleted file mode 100644 index 315bb8b..0000000 Binary files a/maps/re/024-2.mcache and /dev/null differ diff --git a/maps/re/024-3.mcache b/maps/re/024-3.mcache deleted file mode 100644 index 92e7b8d..0000000 Binary files a/maps/re/024-3.mcache and /dev/null differ diff --git a/maps/re/024-4.mcache b/maps/re/024-4.mcache deleted file mode 100644 index dea2082..0000000 Binary files a/maps/re/024-4.mcache and /dev/null differ diff --git a/maps/re/024-5.mcache b/maps/re/024-5.mcache deleted file mode 100644 index 20cf3f9..0000000 Binary files a/maps/re/024-5.mcache and /dev/null differ diff --git a/maps/re/024-6.mcache b/maps/re/024-6.mcache deleted file mode 100644 index 7f66019..0000000 Binary files a/maps/re/024-6.mcache and /dev/null differ diff --git a/maps/re/024-7.mcache b/maps/re/024-7.mcache deleted file mode 100644 index 538dc59..0000000 Binary files a/maps/re/024-7.mcache and /dev/null differ diff --git a/maps/re/024-8.mcache b/maps/re/024-8.mcache deleted file mode 100644 index 4d9491d..0000000 Binary files a/maps/re/024-8.mcache and /dev/null differ diff --git a/maps/re/024-9.mcache b/maps/re/024-9.mcache deleted file mode 100644 index f520368..0000000 Binary files a/maps/re/024-9.mcache and /dev/null differ diff --git a/maps/re/025-1.mcache b/maps/re/025-1.mcache deleted file mode 100644 index b4f5b65..0000000 Binary files a/maps/re/025-1.mcache and /dev/null differ diff --git a/maps/re/025-2-1.mcache b/maps/re/025-2-1.mcache deleted file mode 100644 index 1242639..0000000 Binary files a/maps/re/025-2-1.mcache and /dev/null differ diff --git a/maps/re/025-2-2.mcache b/maps/re/025-2-2.mcache deleted file mode 100644 index 6f95cae..0000000 Binary files a/maps/re/025-2-2.mcache and /dev/null differ diff --git a/maps/re/025-2-3.mcache b/maps/re/025-2-3.mcache deleted file mode 100644 index 704f3d6..0000000 Binary files a/maps/re/025-2-3.mcache and /dev/null differ diff --git a/maps/re/025-2-4.mcache b/maps/re/025-2-4.mcache deleted file mode 100644 index d5f8274..0000000 Binary files a/maps/re/025-2-4.mcache and /dev/null differ diff --git a/maps/re/025-2.mcache b/maps/re/025-2.mcache deleted file mode 100644 index 4d6ddf2..0000000 Binary files a/maps/re/025-2.mcache and /dev/null differ diff --git a/maps/re/025-3.mcache b/maps/re/025-3.mcache deleted file mode 100644 index 57f8e9f..0000000 Binary files a/maps/re/025-3.mcache and /dev/null differ diff --git a/maps/re/026-0.mcache b/maps/re/026-0.mcache deleted file mode 100644 index 800785e..0000000 Binary files a/maps/re/026-0.mcache and /dev/null differ diff --git a/maps/re/026-1.mcache b/maps/re/026-1.mcache deleted file mode 100644 index 225e18b..0000000 Binary files a/maps/re/026-1.mcache and /dev/null differ diff --git a/maps/re/026-2.mcache b/maps/re/026-2.mcache deleted file mode 100644 index 589618c..0000000 Binary files a/maps/re/026-2.mcache and /dev/null differ diff --git a/maps/re/027-0.mcache b/maps/re/027-0.mcache deleted file mode 100644 index 4f7d3c8..0000000 Binary files a/maps/re/027-0.mcache and /dev/null differ diff --git a/maps/re/027-1.mcache b/maps/re/027-1.mcache deleted file mode 100644 index f6b9f0f..0000000 Binary files a/maps/re/027-1.mcache and /dev/null differ diff --git a/maps/re/027-2.mcache b/maps/re/027-2.mcache deleted file mode 100644 index 342ed7a..0000000 Binary files a/maps/re/027-2.mcache and /dev/null differ diff --git a/maps/re/027-3.mcache b/maps/re/027-3.mcache deleted file mode 100644 index 601afbb..0000000 Binary files a/maps/re/027-3.mcache and /dev/null differ diff --git a/maps/re/027-4.mcache b/maps/re/027-4.mcache deleted file mode 100644 index 389cfcc..0000000 Binary files a/maps/re/027-4.mcache and /dev/null differ diff --git a/maps/re/027-5.mcache b/maps/re/027-5.mcache deleted file mode 100644 index 738aa7a..0000000 Binary files a/maps/re/027-5.mcache and /dev/null differ diff --git a/maps/re/027-6.mcache b/maps/re/027-6.mcache deleted file mode 100644 index 265bac5..0000000 Binary files a/maps/re/027-6.mcache and /dev/null differ diff --git a/maps/re/027-7.mcache b/maps/re/027-7.mcache deleted file mode 100644 index e881fce..0000000 Binary files a/maps/re/027-7.mcache and /dev/null differ diff --git a/maps/re/029-0.mcache b/maps/re/029-0.mcache deleted file mode 100644 index 458cdf7..0000000 Binary files a/maps/re/029-0.mcache and /dev/null differ diff --git a/maps/re/029-1.mcache b/maps/re/029-1.mcache deleted file mode 100644 index 962144b..0000000 Binary files a/maps/re/029-1.mcache and /dev/null differ diff --git a/maps/re/029-2.mcache b/maps/re/029-2.mcache deleted file mode 100644 index 1f9eece..0000000 Binary files a/maps/re/029-2.mcache and /dev/null differ diff --git a/maps/re/029-3.mcache b/maps/re/029-3.mcache deleted file mode 100644 index 0d2f17b..0000000 Binary files a/maps/re/029-3.mcache and /dev/null differ diff --git a/maps/re/029-4.mcache b/maps/re/029-4.mcache deleted file mode 100644 index 08cef53..0000000 Binary files a/maps/re/029-4.mcache and /dev/null differ diff --git a/maps/re/029-5.mcache b/maps/re/029-5.mcache deleted file mode 100644 index 7ad99af..0000000 Binary files a/maps/re/029-5.mcache and /dev/null differ diff --git a/maps/re/029-6.mcache b/maps/re/029-6.mcache deleted file mode 100644 index 3d4b75a..0000000 Binary files a/maps/re/029-6.mcache and /dev/null differ diff --git a/maps/re/029-7.mcache b/maps/re/029-7.mcache deleted file mode 100644 index 5f22587..0000000 Binary files a/maps/re/029-7.mcache and /dev/null differ diff --git a/maps/re/029-8.mcache b/maps/re/029-8.mcache deleted file mode 100644 index 37f24b1..0000000 Binary files a/maps/re/029-8.mcache and /dev/null differ diff --git a/maps/re/029-9.mcache b/maps/re/029-9.mcache deleted file mode 100644 index 355ff3c..0000000 Binary files a/maps/re/029-9.mcache and /dev/null differ diff --git a/maps/re/031-1.mcache b/maps/re/031-1.mcache index 20bf524..60f5515 100644 Binary files a/maps/re/031-1.mcache and b/maps/re/031-1.mcache differ diff --git a/maps/re/032-1.mcache b/maps/re/032-1.mcache deleted file mode 100644 index 5511e7d..0000000 Binary files a/maps/re/032-1.mcache and /dev/null differ diff --git a/maps/re/032-2.mcache b/maps/re/032-2.mcache deleted file mode 100644 index 0475be9..0000000 Binary files a/maps/re/032-2.mcache and /dev/null differ diff --git a/maps/re/032-3.mcache b/maps/re/032-3.mcache deleted file mode 100644 index b56be17..0000000 Binary files a/maps/re/032-3.mcache and /dev/null differ diff --git a/maps/re/032-4.mcache b/maps/re/032-4.mcache deleted file mode 100644 index 95465d6..0000000 Binary files a/maps/re/032-4.mcache and /dev/null differ diff --git a/maps/re/032-5.mcache b/maps/re/032-5.mcache deleted file mode 100644 index 946b315..0000000 Binary files a/maps/re/032-5.mcache and /dev/null differ diff --git a/maps/re/034-1.mcache b/maps/re/034-1.mcache deleted file mode 100644 index 6993a7d..0000000 Binary files a/maps/re/034-1.mcache and /dev/null differ diff --git a/maps/re/034-2.mcache b/maps/re/034-2.mcache deleted file mode 100644 index d21013f..0000000 Binary files a/maps/re/034-2.mcache and /dev/null differ diff --git a/maps/re/034-3.mcache b/maps/re/034-3.mcache deleted file mode 100644 index 047f60e..0000000 Binary files a/maps/re/034-3.mcache and /dev/null differ diff --git a/maps/re/034-4.mcache b/maps/re/034-4.mcache deleted file mode 100644 index 9501be6..0000000 Binary files a/maps/re/034-4.mcache and /dev/null differ diff --git a/maps/re/042-0.mcache b/maps/re/042-0.mcache deleted file mode 100644 index 411c754..0000000 Binary files a/maps/re/042-0.mcache and /dev/null differ diff --git a/maps/re/042-1.mcache b/maps/re/042-1.mcache deleted file mode 100644 index 9d7fc14..0000000 Binary files a/maps/re/042-1.mcache and /dev/null differ diff --git a/maps/re/042-10.mcache b/maps/re/042-10.mcache deleted file mode 100644 index 98416a8..0000000 Binary files a/maps/re/042-10.mcache and /dev/null differ diff --git a/maps/re/042-11.mcache b/maps/re/042-11.mcache deleted file mode 100644 index 583cb91..0000000 Binary files a/maps/re/042-11.mcache and /dev/null differ diff --git a/maps/re/042-2.mcache b/maps/re/042-2.mcache deleted file mode 100644 index fd51890..0000000 Binary files a/maps/re/042-2.mcache and /dev/null differ diff --git a/maps/re/042-3.mcache b/maps/re/042-3.mcache deleted file mode 100644 index 1565b2b..0000000 Binary files a/maps/re/042-3.mcache and /dev/null differ diff --git a/maps/re/042-4.mcache b/maps/re/042-4.mcache deleted file mode 100644 index 314434b..0000000 Binary files a/maps/re/042-4.mcache and /dev/null differ diff --git a/maps/re/042-5.mcache b/maps/re/042-5.mcache deleted file mode 100644 index fa52bd3..0000000 Binary files a/maps/re/042-5.mcache and /dev/null differ diff --git a/maps/re/042-6.mcache b/maps/re/042-6.mcache deleted file mode 100644 index cd61cef..0000000 Binary files a/maps/re/042-6.mcache and /dev/null differ diff --git a/maps/re/042-7.mcache b/maps/re/042-7.mcache deleted file mode 100644 index 09d4805..0000000 Binary files a/maps/re/042-7.mcache and /dev/null differ diff --git a/maps/re/042-8.mcache b/maps/re/042-8.mcache deleted file mode 100644 index 08964f5..0000000 Binary files a/maps/re/042-8.mcache and /dev/null differ diff --git a/maps/re/042-9.mcache b/maps/re/042-9.mcache deleted file mode 100644 index 5e1f2d3..0000000 Binary files a/maps/re/042-9.mcache and /dev/null differ diff --git a/maps/re/fermi.mcache b/maps/re/fermi.mcache new file mode 100644 index 0000000..f536965 Binary files /dev/null and b/maps/re/fermi.mcache differ diff --git a/maps/re/soren-2.mcache b/maps/re/soren-2.mcache deleted file mode 100644 index 535ed3f..0000000 Binary files a/maps/re/soren-2.mcache and /dev/null differ diff --git a/maps/re/soren.mcache b/maps/re/soren.mcache deleted file mode 100644 index dd6c150..0000000 Binary files a/maps/re/soren.mcache and /dev/null differ diff --git a/npc/000-0/_import.txt b/npc/000-0/_import.txt index d2f0652..521f29e 100644 --- a/npc/000-0/_import.txt +++ b/npc/000-0/_import.txt @@ -1,4 +1,4 @@ -// Map 000-0: Ocean +// Map 000-0: Aethyr Central Crossroad // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/000-0/mapflags.txt", "npc/000-0/sailors.txt", diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt index 65d06a7..024408f 100644 --- a/npc/000-0/sailors.txt +++ b/npc/000-0/sailors.txt @@ -1,282 +1,65 @@ // TMW2 Script -// Modified by Jesusalva - -// Evol scripts. -// Authors: -// 4144 -// Qwerty Dragon -// Reid -// Vasily_Makarov -// Jesusalva // Description: -// Starting script of Evol Online, modified for TMW2. -// Translation: -// FR Translated +// Main start NPC -000-0,23,19,0 script Sailors NPC_SAILORS,6,6,{ +000-0,23,19,0 script Lost Travelers NPC_SAILORS,6,6,{ OnTouch: - .@q=getq(General_Narrator); - if (.@q) + if (TUT_VAR) end; //checkclientversion; .@lang = requestlang(); if (.@lang >= 0 && .@lang <= MAX_LANG) Lang = .@lang; - showavatar 3; - if ($EVENT$ == "Steam") goto L_FiresOfSteam; - - mesn "Narrator"; - mesc l("You open your eyes. The remants of the salt water in your eyes is not particularly helping you see."); - mesc l("(Click next button to advance dialogs)"), 3; - next; - mesc l("What in the world is happening?! Where in Jesusalva's name are you?!"); - next; - if (getvaultid()) { - mesc l("Sometimes, you really wish you could visit new universes without having to pick some sort of role on it."); - next; - } - mesc l("Actually. Who are you again? A headache which doesn't want to pass strikes you."); - mesc l("You can hear creaking planks and a sail flapping in the storm. A ship?"); - mesc l("You hear shouting directed at you. Sailors from the ship?"); - next; - - showavatar NPC_ORC_MAN; - setcamnpc "Sailors", -64, -32; - mesn l("Orc Voice"); - mesq lg("Hey kid! Can you hear me?"); - next; - - showavatar NPC_SILVIO; - setcamnpc "Sailors", 0, -32; - mesn l("Human Voice"); - mesq lg("Hear you? How do you even know she can understand you?!", "Hear you? How do you even know he can understand you?!"); - next; - - showavatar NPC_TRITAN_MAN_SAILOR; - setcamnpc "Sailors", 144, -80; - mesn l("Tritan Voice"); - mesq l("We speak various languages on this world. Let's try gesturing!"); - mesq l("Hey, you on the dune! Can you hear us?!"); - next; - restorecam; - - asklanguage(LANG_ON_SEA); - showavatar NPC_SAILORS; - setcamnpc; - mes ""; - mesn; - mesq lg("Oh, she's still alive!", "Oh, he's still alive!"); - next; - showavatar NPC_TRITAN_MAN_SAILOR; - setcamnpc "Sailors", 144, -80; - mesq lg("This girl needs help, we need to rescue her!", "This boy needs help, we need to rescue him!"); - next; - mesn; - mesc l("This is a menu. You can click on the desired option and press \"Send\", and double-clicking should work, too."); - mes ""; - select - l("I don't need to be rescued. I'm enjoying myself here."), - l("Thanks... I guess..."), - l("(Don't respond)"); - mes ""; - if (@menu == 1) { - mesn l("Sailor"); - mesq l("What do you mean? Do you at least have a rowboat with you?!"); - next; - mesn l("Billy Bons"); - // Dying of thirst will set in waaaay sooner than dying of hunger. - mesq l("We can't let you die of thirst! That wouldn't be cool at all! And I'm very cool!"); - next; - } else if (@menu == 2) { - mes ""; // You don't need to thank us! - } else { - mesn l("Sailor"); - mesq lg("Oh noes! She fainted! Quick, rescue her!!", "Oh noes! He fainted! Quick, rescue him!!"); + // Standard Procedures + if (!getvaultid()) { + mesc l("This world is exclusive for Mirror Lake Users."); next; + kick(getcharid(3), 3); + end; } - restorecam; - - showavatar; - mesn "Narrator"; - mesc l("The sailors take you aboard their ship."); - mesc l("Click on the NPCs (Non-Player Characters) around you to continue the introduction."); - next; + // TODO: Check if you have a homeworld set - addtimer(20000,"Elmo#sailors::OnSlow"); - warp "000-0-0", 30, 36; + // Set your language (WIP?) + asklanguage(LANG_ON_SEA); - closedialog; - close; -L_FiresOfSteam: - dispbottom l("Welcome to Moubootaur Legends: ##1Fires of Steam##0"); - warp "000-0-1", 26, 28; - sleep2(25); - atcommand("@refresh"); - asklanguage(LANG_ON_SEA); - clear; - mesn "Narrator"; - mesc l("You wake up in the middle of the night. How did you got here? WERE YOU KIDNAPPED?"); - next; - mesn "Narrator"; - mesc l("Memory slowly returns to you as you start growing aware of your surroundings. That's right, you are on a ship."); - next; - mesn "Narrator"; - mesc l("Andrei Sakar, the legendary Hurnscald Hero, as well as a group of alliance members which include yourself, are heading to the continent of Kolev, where is said to be a legendary town which helped the humans from the second era to survive."); - next; - mesn "Narrator"; - mesc l("They were sending food and supplies to the Alliance, but in the past months, there was a deadly silence. Not a single sign of life came from there."); - next; - mesn "Narrator"; - mesc l("Hoping for the best, but prepared for the worst, you set off to the legendary continent of Kolev; Your destination: Artis."); - next; - clear; - mesc l("Moubootaur Legends presents..."), 3; + mesc l("Welcome to..."), 3; mes ""; - mesc b(l(" Fires of Steam ")), 1; - mesc l("- The Death of Andrei Sakar -"), 1; - mes ""; - mesc l("An event to prepare for the Steam Release"), 2; - mes ""; - next; + mesc b(l(" The Crossroads ")), 1; + mesc l("- The world between mana worlds -"), 1; mes ""; + mesc l("The only place where your home world is meaningless."), 2; mes ""; - mesn strcharinfo(0); - mesq l("We'll be arriving at Artis by the dawn, where Elora will be waiting for us. I can only hope, that the denizens are okay..."); + mesc l("This game follows the same gameplay rules as %s. Equipment real effects may differ from their description because this.", b(l("Moubootaur Legends"))); next; clear; GameRules(8 | 4); clear; closeclientdialog; -OnForceReset: - freeloop(true); - while (BaseLevel < 80) - getexp NextBaseExp, 100; - freeloop(false); - setq ShipQuests_Arpan, 5; - setq General_Narrator, 21; - consoleinfo "New account: %d (%s)", getcharid(3), getcharip(); - if (array_find($@IPBLIST$, getcharip()) >= 0) - #TUTORIAL_DONE=true; - else - array_push($@IPBLIST$, getcharip()); - if (!#TUTORIAL_DONE) { - .@acc=any(Mustache, Beard, HeartGlasses, Sunglasses, EyePatch, Shemagh, Monocle, Googles, BurglarMask, BanditMask, Shemagh); - .@ac2=any(OldTowel, SantaGlobe, RedStocking, LeatherBall, Doll, ZarkorScroll, ThetaBook, AshUrn, RubberDucky, DragonStar, BronzeQuiver, AstralCube, PlushMouboo, PlushMouboo, GraduationAlbum); - .@hat=any(TopHat, CaptainHat, SmileyCap, BowlerHat, DesertHat, PirateBandana, KnitHat, RightEyePatch, AntlersHat, BunnyEars, AxeHat, PaperBag, ShroomHat, AFKCap, BrimmedFeatherHat, CatEars, Earmuffs, CorsairHat, SailorHat, ChefHat, SkullMask, LeprechaunHat, PrsmHelmet, ImperialCrown, ClericCap); - .@ha2=any(DarkKnightHelmet, VikingHelmet, TerraniteMask, CenturionHelmet, ChemistHelmet, BullHelmet, DarkHelm, SamuraiHelmet, SamuraiHelmet); - .@che=any(RedknightArmor, AssassinChest, SaviorArmor, TerraniteArmor, GraduationRobe, GoldenWarlordPlate, RedknightArmor); - .@pan=any(JeansChaps, LeatherTrousers, AssassinPants, TerranitePants, BromenalPants, ChainmailSkirt, AssassinPants, ChainmailSkirt, AssassinPants); - .@sho=any(DeepBlackBoots, HeliosBoots, WizardMoccasins, WarlordBoots, TerraniteBoots, AssassinBoots, WitchBoots, RedStockings, DeepBlackBoots, DeepBlackBoots); - .@nec=any(BarbarianAmulet, GoldenFourLeafAmulet, PlatinumFourLeafAmulet, BarbarianMasterAmulet, MoubooPendant, LifestonePendant, AlvasusPendant, ToothNecklace); - .@rin=any(GoldenPearlRing, GoldenBlackPearlRing); - .@glo=any(WarlordGloves, AssassinGloves, TerraniteGloves, ManaGloves, SarabArmlet, LeatherGloves, MinerGloves); - .@shi=any(EnchantedHerbBag, RentCart, Barrel, MasterBola, PiouBola, AncientShield, BlueKnightShield, SteelShield, DragonShield, SnakeBola); - .@wpn=any(Setzer, Kitana, Lightsaber, BoneKnife, AncientSword, LongSword, RockKnife, DivineSword, CentaurSpear, Zambacutou, CursedScythe, Halberd, PynRifle, PynGatling, PynShotgun, PynRevolver, Dustynator, ChampionshipBow, BansheeBow, LeaderWand, ImmortalSword, MysticWand, ChampionshipBow, BansheeBow, LeaderWand, MysticWand); - .@bon=any(Pickaxe, Kanabo, ElficBow, Judgement, ThunderStaff, ReinbooWand, DarkPulsar, Skypiercer, IceGladius, RealBronzeGladius, PurpleBola, KidBola, SilkGloves, ClawPendant, Boots, LuffyxSummerShorts, UglyChristmasSweater, MinerTankTop, ContributorSweater, LinarianSoul, TuxSoul, DeliciousCookie, DarkEggshellHat, Wreath); - .@pet=any(PiouEgg, BhopEgg, MaggotCocoon, DoggyDog, CattyCat, BlackyCat, Ratte, ForestShroomEgg, FluffyEgg, DuckEgg, BatEgg, MoggunEgg, PinkieCrystal, DragonHorn, TamedSnakeEgg); - getitem .@acc, 1; - getitem .@ac2, 1; - getitem .@hat, 1; - getitem .@ha2, 1; - getitem .@che, 1; - getitem .@pan, 1; - getitem .@sho, 1; - getitem .@nec, 1; - getitem .@rin, 1; - getitem .@glo, 1; - getitem .@shi, 1; - getitem .@wpn, 1; - getitem .@bon, 1; - getitem .@pet, 1; - equip(.@acc); - equip(.@ac2); - equip(.@hat); - equip(.@ha2); - equip(.@che); - equip(.@pan); - equip(.@nec); - equip(.@rin); - equip(.@glo); - equip(.@shi); - equip(.@wpn); - Zeny+=rand2(10000, 60000); - } - adddefaultskills(); - sk_lvup(AL_DP); - sk_lvup(AL_DP); - sk_lvup(AL_DP); - sk_lvup(AL_DP); - sk_lvup(AL_DP); - sk_lvup(AL_DP); - sk_lvup(AL_DP); - sk_lvup(TMW2_TRANSMIGRATION); - sk_lvup(AM_REST); - sk_lvup(AM_RESURRECTHOMUN); - sk_lvup(AM_CALLHOMUN); - sk_lvup(TMW2_CRAFT); - sk_lvup(TMW2_CRAFT); - sk_lvup(TMW2_CRAFT); - sk_lvup(TMW2_CRAFT); - sk_lvup(TMW2_CRAFT); - sk_lvup(TMW2_ANCIENTLANGUAGES); - sk_lvup(TMW2_MANABOMB); - sk_lvup(TMW2_GROUNDSTRIKE); - sk_lvup(TMW2_NAPALMBEAT); - sk_lvup(TMW2_ARROWSHOWER); - sk_lvup(any(ALL_INCCARRY, TF_STEAL, MC_VENDING, MC_DISCOUNT, MC_OVERCHARGE)); - sk_lvup(any(AC_OWL, SA_DRAGONOLOGY, TMW2_SAGE, CR_TRUST, SM_PROVOKE, ALL_FULL_THROTTLE, SA_FREECAST, TF_BACKSLIDING, NV_TRICKDEAD, MG_FIREWALL, SO_FIREWALK, GC_DARKILLUSION)); - sk_lvup(any(AC_OWL, SA_DRAGONOLOGY, TMW2_SAGE, CR_TRUST, SM_PROVOKE, ALL_FULL_THROTTLE, SA_FREECAST, TF_BACKSLIDING, NV_TRICKDEAD, MG_FIREWALL, SO_FIREWALK, GC_DARKILLUSION)); - sk_lvup(any(TMW2_KALMURK, TMW2_DRAGOKIN, TMW2_LIMERIZER, TMW2_HALHISS)); - sk_lvup(any(TMW2_KALWULF, TMW2_FAIRYKINGDOM, TMW2_FROZENHEART, TMW2_STONEHEART)); - sk_lvup(any(TMW2_KALBOO, TMW2_KALSPIKE, TMW2_CUTEHEART, TMW2_PLANTKINGDOM, TMW2_FAIRYEMPIRE)); - sk_lvup(any(TMW2_FIRSTAID, TMW2_HEALING, TMW2_MAGNUSHEAL, EVOL_AREA_PROVOKE)); - sk_lvup(any(TMW2_FIRSTAID, TMW2_HEALING, TMW2_MAGNUSHEAL, EVOL_AREA_PROVOKE)); - sk_lvup(any(TMW2_FROSTDIVER, TMW2_NAPALMBEAT, TMW2_MAGICSTRIKE, TMW2_METEORSTRIKE, TMW2_FIREARROW, TMW2_BRAWLING, TMW2_FALKONSTRIKE, TMW2_CHARGEDARROW)); - sk_lvup(any(TMW2_FROSTDIVER, TMW2_NAPALMBEAT, TMW2_MAGICSTRIKE, TMW2_METEORSTRIKE, TMW2_FIREARROW, TMW2_BRAWLING, TMW2_FALKONSTRIKE, TMW2_CHARGEDARROW)); - sk_lvup(any(TMW2_FROSTDIVER, TMW2_NAPALMBEAT, TMW2_MAGICSTRIKE, TMW2_METEORSTRIKE, TMW2_FIREARROW, TMW2_BRAWLING, TMW2_FALKONSTRIKE, TMW2_CHARGEDARROW)); - sk_lvup(any(TMW2_FROSTNOVA, TMW2_HOLYLIGHT, TMW2_LIGHTNINGBOLT, TMW2_METEORSHOWER, TMW2_FIREBALL, TMW2_BEARSTRIKE, TMW2_SUPREMEATTACK, SN_SHARPSHOOTING)); - sk_lvup(any(TMW2_FROSTNOVA, TMW2_HOLYLIGHT, TMW2_LIGHTNINGBOLT, TMW2_METEORSHOWER, TMW2_FIREBALL, TMW2_BEARSTRIKE, TMW2_SUPREMEATTACK, SN_SHARPSHOOTING)); - sk_lvup(any(TMW2_NILFHEIM, TMW2_JUDGMENT, TMW2_TEMPEST, TMW2_GAIABREAK, TMW2_ARMAGEDDON, TMW2_ALLINONE, TMW2_GROUNDSTRIKE, TMW2_ARROWSHOWER, SN_WINDWALK)); - sk_lvup(any(TMW2_GDP_MAXPOWER, TMW2_GDP_SPREGEN)); - getitembound GuildCoin, rand2(500), 4; - getitembound any(StrengthFruit, AgilityFruit, VitalityFruit, IntelligenceFruit, DexterityFruit, LuckFruit), 1, 4; - getitembound any(StrengthFruit, AgilityFruit, VitalityFruit, IntelligenceFruit, DexterityFruit, LuckFruit), 1, 4; - getitembound any(SacredBullet, EvilBullet), 400, 4; - getitembound any(ThornArrow, PoisonArrow, CursedArrow), 400, 4; - getitembound DeathPenalty, rand2(18), 4; - getitembound ScentGrenade, rand2(4), 4; - getitembound InsuranceContract, 1, 4; - getitembound Wurtzite, 6, 4; - getitembound MercCard_AndreiSakar, 1, 4; - getitembound RecipeBook, 1, 1; - getitembound Bread, 10, 4; + + // No naked players + getitem CreasedShirt, 1; + getitem CreasedShorts, 1; + equip(CreasedShirt); + equip(CreasedShorts); + + // Basic setup + adddefaultskills; percentheal 100,100; - LOCATION$ = "Artis"; TUT_VAR=gettimetick(2); #TUTORIAL_DONE=true; #REG_DATE=gettimetick(2); - TUTORIAL=true; - CRAFTQUEST=true; - MPQUEST=true; - MAGIC_LVL=7; - savepoint "029-0", 202, 85; - if (!@forcereset) - warp "029-0", 202, 85; - close; -OnForceReset2: - logmes(sprintf("%s - Reset Forced by System Admin", getcharid(3))); - #TUTORIAL_DONE=false; - @forcereset=true; - goto OnForceReset; + // Final warp + warp "033-1", 122, 192; + savepoint "033-1", 122, 192; + close; OnInit: .sex = G_MALE; - bindatcmd "sakarfr", "Sailors::OnForceReset2", 100, 99, 1; end; } diff --git a/npc/000-1/exit.txt b/npc/000-1/exit.txt index aed9a8c..bf1ab08 100644 --- a/npc/000-1/exit.txt +++ b/npc/000-1/exit.txt @@ -9,6 +9,7 @@ OnTouch: OnTalk: OnTalkNearby: // At any time, if you can't leave Nard ship, you must go to nard ship + /* if (!getq(General_Narrator) && getq(ShipQuests_Julia) < 3) { warp "002-1@Candor", 53, 38; end; @@ -26,6 +27,8 @@ OnTalkNearby: if (getsavepoint(0) != "000-1") end; //savepoint "002-1", 53, 38; warp "002-1", 53, 38; + */ + warp "033-1", 122, 192; end; } diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt index 71cb54d..9a773d0 100644 --- a/npc/001-1/_import.txt +++ b/npc/001-1/_import.txt @@ -1,5 +1,6 @@ -// Map 001-1: Floating Island of Aeros +// Map 001-1: Porthos - Town of Portals // This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/001-1/_warps.txt", "npc/001-1/bgmaster.txt", "npc/001-1/eventmaster.txt", "npc/001-1/mahul.txt", diff --git a/npc/001-1/_warps.txt b/npc/001-1/_warps.txt new file mode 100644 index 0000000..90b773c --- /dev/null +++ b/npc/001-1/_warps.txt @@ -0,0 +1,6 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 001-1: Porthos - Town of Portals warps +001-1,189,94,0 warp #001-1_189_94 0,0,033-5,29,48 +001-1,167,89,0 warp #001-1_167_89 0,0,033-4,35,42 +001-1,172,101,0 warp #001-1_172_101 0,0,033-2,40,48 +001-1,72,190,0 warp #001-1_72_190 0,0,020-1,69,41 diff --git a/npc/001-2/_import.txt b/npc/001-2/_import.txt index d7c488a..151d535 100644 --- a/npc/001-2/_import.txt +++ b/npc/001-2/_import.txt @@ -1,3 +1,4 @@ // Map 001-2: Coliseum // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2/mapflags.txt", +"npc/001-2/treasure.txt", diff --git a/npc/001-2/treasure.txt b/npc/001-2/treasure.txt new file mode 100644 index 0000000..1624924 --- /dev/null +++ b/npc/001-2/treasure.txt @@ -0,0 +1,66 @@ +// TMW2 scripts. +// Author: +// Jesusalva +// Description: +// Fishing and Treasure Box + +// Animation code by Evol Team +// 4144, gumi, Hal9000, Reid +// (Random) Treasure Chest +// Authored by Jesusalva +// Regenerates every 6 hours +011-1,0,0,0 script #chest_00710 NPC_CHEST,{ + + if (!.busy && !.empty) { + TreasureBox(); + + specialeffect(.dir == 0 ? 24 : 25, AREA, getnpcid()); // closed ? opening : closing + .dir = .dir == 0 ? 2 : 6; // closed ? opening : closing + .busy = true; // lock until available again + initnpctimer; + } else if (!.busy) { + mesc l("Someone looted this treasure box already..."); + } else { + end; + } + close; + +OnTimer160: + .dir = .dir == 6 ? 0 : 4; // closing ? closed : open + end; + +OnTimer500: + .busy = false; // unlock + if (.dir == 0 || .dir == 4) + stopnpctimer; // stop here if the chest is closed + end; + +OnInit: + .busy = false; + .distance = 2; + .empty = false; + +OnClock0156: +OnClock0756: +OnClock1356: +OnClock1956: + // Try to warp randomly to a walkable spot, up to 20 attempts + // Otherwise, it'll stay where it already is (but will close and refill). + .@e=0; .@x=0; .@y=0; + while (!checkcell(.map$, .@x, .@y, cell_chkpass)) + { + if (.@e == 20) { + .@x=.x; + .@y=.y; + break; + } + // Remember the +20 -20 margin adjustment + .@x = rand(20, 185); + .@y = rand(20, 180); + ++.@e; + } + .busy=false; + .empty=false; + movenpc .name$, .@x, .@y, 0; + end; +} diff --git a/npc/001-3/_import.txt b/npc/001-3/_import.txt index 3a2cb29..2118c10 100644 --- a/npc/001-3/_import.txt +++ b/npc/001-3/_import.txt @@ -1,4 +1,3 @@ -// Map 001-3: Saulc's Home +// Map 001-3: Dark Forest // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/001-3/_warps.txt", "npc/001-3/ctrl.txt", diff --git a/npc/001-3/_warps.txt b/npc/001-3/_warps.txt deleted file mode 100644 index 732ca93..0000000 --- a/npc/001-3/_warps.txt +++ /dev/null @@ -1,11 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-3: Saulc's Home warps -001-3,80,123,0 warp #001-3_80_123 0,0,001-3-1,24,61 -001-3,127,124,0 warp #001-3_127_124 0,0,001-3-1,117,61 -001-3,104,80,0 warp #001-3_104_80 3,0,001-3-1,45,126 -001-3,106,65,0 warp #001-3_106_65 0,0,001-3-1,116,126 -001-3,101,65,0 warp #001-3_101_65 0,0,001-3-1,97,126 -001-3,117,138,0 warp #001-3_117_138 0,0,000-1,22,22 -001-3,72,103,0 warp #001-3_72_103 0,0,001-3-1,24,30 -001-3,135,103,0 warp #001-3_135_103 0,0,001-3-1,117,30 -001-3,66,121,0 warp #001-3_66_121 0,2,004-2,50,61 diff --git a/npc/001-5/_import.txt b/npc/001-5/_import.txt index 5c94ec5..2c40d6b 100644 --- a/npc/001-5/_import.txt +++ b/npc/001-5/_import.txt @@ -1,5 +1,4 @@ -// Map 001-5: Contributor's Cave +// Map 001-5: Beasts Dungeon // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/001-5/_mobs.txt", "npc/001-5/_warps.txt", "npc/001-5/worker.txt", diff --git a/npc/001-5/_mobs.txt b/npc/001-5/_mobs.txt deleted file mode 100644 index 6a6fd7f..0000000 --- a/npc/001-5/_mobs.txt +++ /dev/null @@ -1,8 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-5: Contributor's Cave mobs -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-5: Contributor's Cave mobs -001-5,49,49,29,29 monster Blub 1008,2,35000,60000 -001-5,53,50,25,29 monster Snake 1122,1,35000,120000 -001-5,54,51,25,29 monster Night Scorpion 1077,1,35000,150000 -001-5,51,49,29,29 monster Stray Little Blub 1007,3,35000,180000 diff --git a/npc/001-5/_warps.txt b/npc/001-5/_warps.txt index 5d41810..0e2eac5 100644 --- a/npc/001-5/_warps.txt +++ b/npc/001-5/_warps.txt @@ -1,5 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-5: Contributor's Cave warps -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-5: Contributor's Cave warps -001-5,22,80,0 warp #001-5_22_80 0,0,000-1,22,22 +// Map 001-5: Beasts Dungeon warps +001-5,121,102,0 warp #001-5_121_102 0,0,032-2,103,112 diff --git a/npc/003-3/_import.txt b/npc/003-3/_import.txt index d371450..c934b91 100644 --- a/npc/003-3/_import.txt +++ b/npc/003-3/_import.txt @@ -1,4 +1,3 @@ // Map 003-3: Tulimshar Storage // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/003-3/_warps.txt", "npc/003-3/malindou.txt", diff --git a/npc/003-3/_warps.txt b/npc/003-3/_warps.txt deleted file mode 100644 index 3f24581..0000000 --- a/npc/003-3/_warps.txt +++ /dev/null @@ -1,3 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 003-3: Tulimshar Storage warps -003-3,39,41,0 warp #003-3_39_41 0,0,003-1,56,100 diff --git a/npc/006-10/_import.txt b/npc/006-10/_import.txt index 69724d9..72ca523 100644 --- a/npc/006-10/_import.txt +++ b/npc/006-10/_import.txt @@ -1,6 +1,5 @@ // Map 006-10: Fefe's Crypt // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/006-10/006-10_blackbox.txt", "npc/006-10/_config.txt", "npc/006-10/_mobs.txt", "npc/006-10/_warps.txt", diff --git a/npc/006-4-1/_import.txt b/npc/006-4-1/_import.txt index 1fea850..e820466 100644 --- a/npc/006-4-1/_import.txt +++ b/npc/006-4-1/_import.txt @@ -1,6 +1,5 @@ // Map 006-4-1: Abandoned Building // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/006-4-1/_config.txt", -"npc/006-4-1/_mobs.txt", "npc/006-4-1/_warps.txt", "npc/006-4-1/painting.txt", diff --git a/npc/006-4-1/_mobs.txt b/npc/006-4-1/_mobs.txt deleted file mode 100644 index 76eaeba..0000000 --- a/npc/006-4-1/_mobs.txt +++ /dev/null @@ -1,6 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 006-4-1: Abandoned Building mobs -006-4-1,55,103,19,9 monster Mana Ghost 1068,6,75000,250000 -006-4-1,55,46,31,11 monster Green Slime Mother 1236,6,75000,25000 -006-4-1,56,101,28,9 monster Yellow Slime Mother 1239,4,75000,25000 -006-4-1,54,151,14,10 monster Red Slime Mother 1240,3,75000,25000 diff --git a/npc/006-4/_import.txt b/npc/006-4/_import.txt index 78369b5..3cc9fe9 100644 --- a/npc/006-4/_import.txt +++ b/npc/006-4/_import.txt @@ -1,6 +1,5 @@ // Map 006-4: Abandoned Island // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/006-4/_config.txt", -"npc/006-4/_mobs.txt", "npc/006-4/_warps.txt", "npc/006-4/soulstone.txt", diff --git a/npc/006-4/_mobs.txt b/npc/006-4/_mobs.txt deleted file mode 100644 index 793827f..0000000 --- a/npc/006-4/_mobs.txt +++ /dev/null @@ -1,18 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 006-4: Abandoned Island mobs -006-4,57,82,10,24 monster Mana Ghost 1068,5,75000,25000 -006-4,59,192,16,19 monster Mana Ghost 1068,9,75000,250000 -006-4,94,179,17,15 monster Mana Ghost 1068,9,75000,250000 -006-4,128,183,14,19 monster Mana Ghost 1068,9,75000,250000 -006-4,102,202,20,8 monster Mana Ghost 1068,9,75000,250000 -006-4,101,153,21,10 monster Mana Ghost 1068,9,75000,250000 -006-4,95,66,39,11 monster Green Dragon 1195,6,75000,105000 -006-4,31,251,17,12 monster Green Slime Mother 1236,1,75000,25000 -006-4,66,203,15,11 monster Green Slime Mother 1236,3,75000,25000 -006-4,139,154,14,9 monster Green Slime Mother 1236,1,75000,25000 -006-4,149,181,7,19 monster Green Slime Mother 1236,1,75000,25000 -006-4,60,149,11,12 monster Green Slime Mother 1236,1,75000,25000 -006-4,142,77,10,22 monster Blue Slime Mother 1237,1,75000,25000 -006-4,94,91,34,11 monster Copper Slime Mother 1238,1,75000,25000 -006-4,94,85,35,6 monster Green Dragon 1195,6,75000,105000 -006-4,55,97,12,9 monster White Slime Mother 1242,1,120000,25000 diff --git a/npc/006-4/_warps.txt b/npc/006-4/_warps.txt index cc25e7c..5761a5a 100644 --- a/npc/006-4/_warps.txt +++ b/npc/006-4/_warps.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 006-4: Abandoned Island warps 006-4,95,99,0 warp #006-4_95_99 1,0,006-4-1,58,60 -006-4,32,257,0 warp #006-4_32_257 0,0,006-3,54,36 +006-4,32,257,0 warp #006-4_32_257 0,0,033-1,72,191 006-4,71,83,0 warp #006-4_71_83 1,0,006-4-1,44,31 diff --git a/npc/006-5/_warps.txt b/npc/006-5/_warps.txt index b9d0bcf..37a4e29 100644 --- a/npc/006-5/_warps.txt +++ b/npc/006-5/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 006-5: Groata Grotto warps -006-5,49,54,0 warp #006-5_49_54 0,0,006-3,40,36 +006-5,49,54,0 warp #006-5_49_54 0,0,033-1,72,191 diff --git a/npc/007-1/treasure.txt b/npc/007-1/treasure.txt deleted file mode 100644 index 9c887ed..0000000 --- a/npc/007-1/treasure.txt +++ /dev/null @@ -1,86 +0,0 @@ -// TMW2 scripts. -// Author: -// Jesusalva -// Description: -// Fishing and Treasure Box - -007-1,155,163,0 script #fishing_00710 NPC_WATER_SPLASH,{ - - .@regen_time=200; - fishing(2, CommonCarp, RustyKnife, - ScorpionStinger, FatesPotion, GrassCarp); // begin or continue fishing (AlchemyBlueprintA, EquipmentBlueprintA) TODO - close; - -OnInit: - .sex = G_OTHER; - .distance = 4; - .cooldown = 200; - .bp_chance = 2; - end; -} - -/* -007-1,x,y,0 duplicate(#fishing_00710) #fishing_00711 NPC_WATER_SPLASH -007-1,x,y,0 duplicate(#fishing_00710) #fishing_00712 NPC_WATER_SPLASH -*/ - -// Animation code by Evol Team -// 4144, gumi, Hal9000, Reid -// (Random) Treasure Chest -// Authored by Jesusalva -// Regenerates every 6 hours -007-1,0,0,0 script #chest_00710 NPC_CHEST,{ - - if (!.busy && !.empty) { - TreasureBox(); - - specialeffect(.dir == 0 ? 24 : 25, AREA, getnpcid()); // closed ? opening : closing - .dir = .dir == 0 ? 2 : 6; // closed ? opening : closing - .busy = true; // lock until available again - initnpctimer; - } else if (!.busy) { - mesc l("Someone looted this treasure box already..."); - } else { - end; - } - close; - -OnTimer160: - .dir = .dir == 6 ? 0 : 4; // closing ? closed : open - end; - -OnTimer500: - .busy = false; // unlock - if (.dir == 0 || .dir == 4) - stopnpctimer; // stop here if the chest is closed - end; - -OnInit: - .busy = false; - .distance = 2; - .empty = false; - -OnClock0156: -OnClock0756: -OnClock1356: -OnClock1956: - // Try to warp randomly to a walkable spot, up to 20 attempts - // Otherwise, it'll stay where it already is (but will close and refill). - .@e=0; .@x=0; .@y=0; - while (!checkcell(.map$, .@x, .@y, cell_chkpass)) - { - if (.@e == 20) { - .@x=.x; - .@y=.y; - break; - } - // Remember the +20 -20 margin adjustment - .@x = rand(20, 185); - .@y = rand(20, 180); - ++.@e; - } - .busy=false; - .empty=false; - movenpc .name$, .@x, .@y, 0; - end; -} diff --git a/npc/011-1/_import.txt b/npc/011-1/_import.txt index 258abb6..613e580 100644 --- a/npc/011-1/_import.txt +++ b/npc/011-1/_import.txt @@ -1,6 +1,4 @@ // Map 011-1: Depleted Mana Stones Mine // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/011-1/_mobs.txt", "npc/011-1/_warps.txt", -"npc/011-1/manastone.txt", "npc/011-1/treasure.txt", diff --git a/npc/011-1/_mobs.txt b/npc/011-1/_mobs.txt deleted file mode 100644 index 6ab25f2..0000000 --- a/npc/011-1/_mobs.txt +++ /dev/null @@ -1,7 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 011-1: Depleted Mana Stones Mine mobs -011-1,99,100,79,79 monster Mana Ghost 1068,40,20000,20000 -011-1,98,101,79,79 monster Fire Goblin 1067,90,60000,60000 -011-1,100,99,79,79 monster Lava Slime 1097,30,60000,60000 -011-1,101,98,79,79 monster Red Slime 1092,100,60000,60000 -011-1,97,102,79,79 monster Mineral Bif 1058,20,60000,60000 diff --git a/npc/011-1/_warps.txt b/npc/011-1/_warps.txt index bba2aa0..489359e 100644 --- a/npc/011-1/_warps.txt +++ b/npc/011-1/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 011-1: Depleted Mana Stones Mine warps -011-1,177,178,0 warp #011-1_177_178 0,0,009-1,119,41 +011-1,177,178,0 warp #011-1_177_178 0,0,033-1,72,191 diff --git a/npc/011-1/manastone.txt b/npc/011-1/manastone.txt deleted file mode 100644 index 3d8df2b..0000000 --- a/npc/011-1/manastone.txt +++ /dev/null @@ -1,136 +0,0 @@ -// TMW2 Script -// Author: -// Jesusalva -// Description: -// The last Mana Stone in the whole world, which is not owned by the Magic Council -// or the Monster King. -// It actually hates (or rather, fears) everybody, and is not always willing to -// talk with people. May hide itself within the walls during these occasions. -// It may not hate some very specific things which are lore-related. -// -// Notes: During sieges, Monster King and Human Council apparitions, it may hide -// itself. -// -// Variables: -// $MANA_BINT => Base Intelligence for Mana Stone -// $MANA_BLVL => Base Level for Mana Stone -// $MANA_JLVL => Base Job Level for Mana Stone -// .int => Int Increment -// .lvl => Lvl Increment -// .jlvl => Jlv Increment - -011-1,0,0,0 script Mana Stone NPC_MANA_STONE,{ - function dearLord; - - if (BaseLevel < $MANA_BLVL) goto L_NotWorthy; - mesn; - mes l("The mighty Mana Stone does not reacts against you."); - mes l("Although this particular one seems to hate everyone and everything, it recognizes your strength."); - mes l("If you fell ready, perhaps you should touch it?"); - mes ""; - menu - l("Touch it!"), L_Level, - l("Take it!"), L_NotWorthy2, - l("Break it!"), L_NotWorthy2, - l("Leave it alone!"), -; - close; - - - -L_NotWorthy2: - if (is_gm()) movenpc .name$, 20+rand(150), 20+rand(150); - if (is_gm()) close; - npctalk3 l("You are not worthy!"); - percentheal -20, -50; - if (!MAGIC_LVL) - dispbottom l("I should train my intelligence, have full MP, and don't neglect even Job Level."); - end; - -L_Level: - // See functions/util.txt for *mstone() details - if (mstone(0)) goto L_LevelUp; - if (mstone(1)) goto L_LevelUp; - if (mstone(2)) goto L_LevelUp; - if (mstone(3)) goto L_LevelUp; - if (mstone(4)) goto L_LevelUp; - if (mstone(5)) goto L_LevelUp; - if (mstone(6)) goto L_LevelUp; - if (MAGIC_LVL >= 7) dearLord(); - if (MAGIC_LVL >= 7) npctalk3 l("You already got all power I could grant you!"); - if (is_gm()) percentheal -20, -50; - if (MAGIC_LVL >= 7 || is_gm()) close; - -L_NotWorthy: - if (readparam(Sp) != readparam(MaxSp)) - dispbottom l("I must have full MP to touch it... Which I don't."); - else - dispbottom l("I should train my intelligence, and level up, both my base as my Job Level."); - npctalk3 l("You are not worthy!"); - percentheal min(-10, -70+BaseLevel), min(-10, -100+BaseLevel); - end; - -L_LevelUp: - mes ""; - mes l("A great rush of mana flows though you."); - if (!MAGIC_LVL) mes l("Magic Power is granted to you, but you die from it."); - if (MAGIC_LVL) mes l("More Magic Power is granted to you, but you die from it."); - MAGIC_LVL = MAGIC_LVL+1; - sk_lvup(AL_DP); - // No penalty for death provoked by Mana Stone, see npc/001-8/hub.txt for more info - sc_start SC_CASH_DEATHPENALTY, 1000, 1; - /* - @deathpenalty_realvalue=readparam(BaseExp); - @deathpenalty_realvaljob=readparam(JobExp); - @deathpenalty_override=1; - */ - die(); - close; - -function dearLord { - if ($MANASTONE_WINNER$ == "") { - $MANASTONE_WINNER$=strcharinfo(0); - channelmes("#world", $MANASTONE_WINNER$+" is the first player to reach "+get_race()+"'s magic limit since the Monster King! %%N"); - announce "All hail ##B"+$MANASTONE_WINNER$+"##b, first to reach "+get_race()+"'s magic limit since the Monster King! %%N", bc_all|bc_npc; - getexp 0, 2000; - getitem SupremeGift, 1; - mesc l("CONGRATULATIONS! You are the first player to harness all power the Mana Stone would willingly give!"), 2; - mesc l("You just gained a Supreme Gift, and 2000 Job Exp for your bravery!"), 2; - next; - } - return; -} - -OnInit: - movenpc .name$, 20+rand(150), 20+rand(150); - .sex = G_OTHER; - .distance = 6; - end; - -OnClock0030: -OnClock0120: -OnClock0210: -OnClock0300: -OnClock0450: -OnClock0540: -OnClock0630: -OnClock0720: -OnClock0810: -OnClock0900: -OnClock1050: -OnClock1140: -OnClock1230: -OnClock1320: -OnClock1410: -OnClock1500: -OnClock1650: -OnClock1740: -OnClock1830: -OnClock1920: -OnClock2010: -OnClock2100: -OnClock2250: -OnClock2340: - npctalk "Those who are worthy, may get my magic. For the others, death awaits!"; - movenpc .name$, 20+rand(150), 20+rand(150); - end; -} diff --git a/npc/015-8/_import.txt b/npc/015-8/_import.txt index 27ea890..0258f7c 100644 --- a/npc/015-8/_import.txt +++ b/npc/015-8/_import.txt @@ -1,6 +1,5 @@ // Map 015-8: Ancient Hideout // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/015-8/015-8_blackbox.txt", "npc/015-8/_mobs.txt", "npc/015-8/config.txt", "npc/015-8/puzzle.txt", diff --git a/npc/017-1/_import.txt b/npc/017-1/_import.txt index 42925f9..7df9ce6 100644 --- a/npc/017-1/_import.txt +++ b/npc/017-1/_import.txt @@ -1,6 +1,5 @@ // Map 017-1: Land Of Fire Village // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/017-1/017-1_stranger_blackbox.txt", "npc/017-1/_mobs.txt", "npc/017-1/_warps.txt", "npc/017-1/boringnpc.txt", diff --git a/npc/017-2-2/_import.txt b/npc/017-2-2/_import.txt index 1f63289..9ce80e0 100644 --- a/npc/017-2-2/_import.txt +++ b/npc/017-2-2/_import.txt @@ -1,4 +1,3 @@ // Map 017-2-2: Skull Cave // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/017-2-2/_mobs.txt", "npc/017-2-2/_warps.txt", diff --git a/npc/017-2-2/_mobs.txt b/npc/017-2-2/_mobs.txt deleted file mode 100644 index d409717..0000000 --- a/npc/017-2-2/_mobs.txt +++ /dev/null @@ -1,4 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 017-2-2: Skull Cave mobs -017-2-2,70,57,16,20 monster Shadow Plant 1189,4,60000,10000 -017-2-2,70,55,14,20 monster Dark Lizard 1051,18,25000,25000 diff --git a/npc/017-2-2/_warps.txt b/npc/017-2-2/_warps.txt index 7ee8b20..90434b5 100644 --- a/npc/017-2-2/_warps.txt +++ b/npc/017-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 017-2-2: Skull Cave warps -017-2-2,71,78,0 warp #017-2-2_71_78 1,0,017-2-1,39,24 +017-2-2,71,78,0 warp #017-2-2_71_78 1,0,033-1,72,191 diff --git a/npc/018-2-1/mapflags.txt b/npc/018-2-1/mapflags.txt index e148e82..914bfeb 100644 --- a/npc/018-2-1/mapflags.txt +++ b/npc/018-2-1/mapflags.txt @@ -1,6 +1,6 @@ // The whole Heroes Hold but outside area is a MMO area. -018-2-2 mapflag zone MMO -018-2-3 mapflag zone MMO -018-2-4 mapflag zone MMO 018-2-5 mapflag zone MMO +018-2-6 mapflag zone MMO +018-2-7 mapflag zone MMO +018-2-8 mapflag zone MMO diff --git a/npc/018-2/_warps.txt b/npc/018-2/_warps.txt index d529700..0bad548 100644 --- a/npc/018-2/_warps.txt +++ b/npc/018-2/_warps.txt @@ -1,4 +1,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 018-2: Heroes' Hold - Outside warps -018-2,63,106,0 warp #018-2_63_106 0,0,017-1,180,194 +018-2,63,106,0 warp #018-2_63_106 0,0,033-1,72,191 018-2,72,63,0 warp #018-2_72_63 3,0,018-2-1,26,32 diff --git a/npc/018-7-1/_import.txt b/npc/018-7-1/_import.txt index cefe635..c18bacb 100644 --- a/npc/018-7-1/_import.txt +++ b/npc/018-7-1/_import.txt @@ -1,6 +1,5 @@ // Map 018-7-1: Developers' Lair (Lilit Palace) // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/018-7-1/018-7-1_demure_blackbox.txt", "npc/018-7-1/_mobs.txt", "npc/018-7-1/_warps.txt", "npc/018-7-1/demure.txt", diff --git a/npc/023-4/_import.txt b/npc/023-4/_import.txt index ebd1020..22fe61c 100644 --- a/npc/023-4/_import.txt +++ b/npc/023-4/_import.txt @@ -1,6 +1,5 @@ // Map 023-4: Ice Caves // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/023-4/023-4_blackbox.txt", "npc/023-4/_mobs.txt", "npc/023-4/_warps.txt", "npc/023-4/traps.txt", diff --git a/npc/025-2-4/_import.txt b/npc/025-2-4/_import.txt index e9181f3..a012b10 100644 --- a/npc/025-2-4/_import.txt +++ b/npc/025-2-4/_import.txt @@ -1,6 +1,5 @@ // Map 025-2-4: Mana Tree Cave // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/025-2-4/025-2-4_aegis_blackbox.txt", "npc/025-2-4/_mobs.txt", "npc/025-2-4/_warps.txt", "npc/025-2-4/tree.txt", diff --git a/npc/031-1/_import.txt b/npc/031-1/_import.txt index 9de05ba..16f725f 100644 --- a/npc/031-1/_import.txt +++ b/npc/031-1/_import.txt @@ -1,4 +1,3 @@ // Map 031-1: Aethyr // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/031-1/_mobs.txt", "npc/031-1/_warps.txt", diff --git a/npc/031-1/_mobs.txt b/npc/031-1/_mobs.txt deleted file mode 100644 index 61c846d..0000000 --- a/npc/031-1/_mobs.txt +++ /dev/null @@ -1,8 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 031-1: Aethyr mobs -031-1,56,62,52,44 monster Pollet 1219,24,90000,30000 -031-1,68,82,43,23 monster Iced Fluffy 1041,13,60000,30000 -031-1,89,40,15,16 monster White Slime 1094,6,90000,30000 -031-1,24,59,10,44 monster Wind Fairy 1185,4,75000,30000 -031-1,56,48,29,23 monster Santa Slime 1096,7,30000,30000 -031-1,24,23,3,4 monster Whirly Bird 1232,1,300000,300000 diff --git a/npc/031-1/_warps.txt b/npc/031-1/_warps.txt index 88cef18..f58c587 100644 --- a/npc/031-1/_warps.txt +++ b/npc/031-1/_warps.txt @@ -1,7 +1,7 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 031-1: Aethyr warps 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,58,104,0 warp #031-1_58_104 0,0,033-1,105,149 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 diff --git a/npc/033-1/_import.txt b/npc/033-1/_import.txt index 247d96f..90c62d6 100644 --- a/npc/033-1/_import.txt +++ b/npc/033-1/_import.txt @@ -1,3 +1,4 @@ // Map 033-1: Porthos - Town of Portals // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/033-1/_warps.txt", +"npc/033-1/misc.txt", diff --git a/npc/033-1/_warps.txt b/npc/033-1/_warps.txt index cd8747f..83bb3bc 100644 --- a/npc/033-1/_warps.txt +++ b/npc/033-1/_warps.txt @@ -3,4 +3,13 @@ 033-1,189,94,0 warp #033-1_189_94 0,0,033-5,29,48 033-1,167,89,0 warp #033-1_167_89 0,0,033-4,35,42 033-1,172,101,0 warp #033-1_172_101 0,0,033-2,40,48 -033-1,72,190,0 warp #033-1_72_190 0,0,020-1,69,41 +033-1,49,192,0 script #033-1_49_192 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 153,87; end; +} +033-1,153,86,0 script #033-1_153_86 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 49,193; end; +} diff --git a/npc/033-1/misc.txt b/npc/033-1/misc.txt new file mode 100644 index 0000000..50fc9de --- /dev/null +++ b/npc/033-1/misc.txt @@ -0,0 +1,38 @@ +// Moubootaur Legends Script +// Author: +// Jesusalva +// Description: +// Guild House + +033-1,134,79,0 script #GDoor NPC_NO_SPRITE,0,0,{ + end; +OnTouch: + if (getcharid(2) < 1) { + dispbottom l("You do not belong to a guild."); + end; + } + // Warp you to your guild house if exist. + // Build the instance otherwise. + + // Well, "checking if instance exist by mapname" is an illusion. + // So we try to build and if we fail, we warp the player to the instance. + .@ID=getcharid(2); + @MAP_NAME$="guild@"+str(.@ID); // Max 4 chars for map name + + .@INSTID = instance_create("guilds@a"+(.@ID), getcharid(2), IOT_GUILD); + + // Instance already exists - .@INSTID returns "-4" + if (.@INSTID == -4) { + warp @MAP_NAME$, any(34,35), 48; + end; + } + + .@instanceMapName$ = instance_attachmap("guilds", .@INSTID, 0, @MAP_NAME$); + + instance_set_timeout(0, 0, .@INSTID); + instance_init(.@INSTID); + warp @MAP_NAME$, any(34,35), 48; + end; + +} + diff --git a/npc/_import.txt b/npc/_import.txt index 1d7d82c..a1bfbd9 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -1,10 +1,7 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -@include "npc/000-0-0/_import.txt" -@include "npc/000-0-1/_import.txt" @include "npc/000-0/_import.txt" @include "npc/000-1/_import.txt" -@include "npc/001-1/_import.txt" @include "npc/001-10-1/_import.txt" @include "npc/001-10/_import.txt" @include "npc/001-11/_import.txt" @@ -15,285 +12,26 @@ @include "npc/001-13/_import.txt" @include "npc/001-14/_import.txt" @include "npc/001-2/_import.txt" -@include "npc/001-3-1/_import.txt" @include "npc/001-3/_import.txt" @include "npc/001-4/_import.txt" -@include "npc/001-5/_import.txt" -@include "npc/001-6/_import.txt" -@include "npc/001-7/_import.txt" @include "npc/001-8/_import.txt" @include "npc/001-9/_import.txt" -@include "npc/002-1/_import.txt" -@include "npc/002-2/_import.txt" -@include "npc/002-3/_import.txt" -@include "npc/002-4/_import.txt" -@include "npc/002-5/_import.txt" -@include "npc/003-0-1/_import.txt" -@include "npc/003-0-2/_import.txt" -@include "npc/003-0/_import.txt" -@include "npc/003-1-1/_import.txt" -@include "npc/003-1-2/_import.txt" -@include "npc/003-1-3/_import.txt" -@include "npc/003-1/_import.txt" -@include "npc/003-10/_import.txt" -@include "npc/003-13/_import.txt" -@include "npc/003-2-1/_import.txt" -@include "npc/003-2/_import.txt" @include "npc/003-3/_import.txt" -@include "npc/003-4-1/_import.txt" -@include "npc/003-4/_import.txt" -@include "npc/003-5/_import.txt" -@include "npc/003-6/_import.txt" -@include "npc/003-7/_import.txt" -@include "npc/003-8/_import.txt" -@include "npc/003-9-1/_import.txt" -@include "npc/003-9/_import.txt" -@include "npc/004-1/_import.txt" -@include "npc/004-2-1/_import.txt" -@include "npc/004-2-10/_import.txt" -@include "npc/004-2-11/_import.txt" -@include "npc/004-2-12/_import.txt" -@include "npc/004-2-2/_import.txt" -@include "npc/004-2-3/_import.txt" -@include "npc/004-2-4/_import.txt" -@include "npc/004-2-5/_import.txt" -@include "npc/004-2-6/_import.txt" -@include "npc/004-2-7/_import.txt" -@include "npc/004-2-8/_import.txt" -@include "npc/004-2-9/_import.txt" -@include "npc/004-2/_import.txt" -@include "npc/004-3-1/_import.txt" -@include "npc/004-3-2/_import.txt" -@include "npc/004-3-3/_import.txt" -@include "npc/004-3-4/_import.txt" -@include "npc/004-3-5/_import.txt" -@include "npc/004-3-6/_import.txt" -@include "npc/004-3/_import.txt" -@include "npc/005-1-1/_import.txt" -@include "npc/005-1/_import.txt" -@include "npc/005-2-1/_import.txt" -@include "npc/005-2/_import.txt" -@include "npc/005-3/_import.txt" -@include "npc/005-4/_import.txt" -@include "npc/005-5/_import.txt" -@include "npc/005-6/_import.txt" -@include "npc/005-7/_import.txt" -@include "npc/006-0/_import.txt" @include "npc/006-1/_import.txt" -@include "npc/006-10/_import.txt" -@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" @include "npc/006-4/_import.txt" @include "npc/006-5/_import.txt" -@include "npc/006-6/_import.txt" @include "npc/006-7/_import.txt" @include "npc/006-8/_import.txt" @include "npc/006-9/_import.txt" -@include "npc/007-1-1/_import.txt" -@include "npc/007-1-2/_import.txt" -@include "npc/007-1/_import.txt" -@include "npc/007-2/_import.txt" -@include "npc/008-0/_import.txt" -@include "npc/008-1/_import.txt" -@include "npc/008-2/_import.txt" -@include "npc/009-1/_import.txt" -@include "npc/009-2/_import.txt" -@include "npc/009-3/_import.txt" -@include "npc/009-4/_import.txt" -@include "npc/009-5/_import.txt" -@include "npc/009-6/_import.txt" -@include "npc/009-7/_import.txt" -@include "npc/010-1-1/_import.txt" -@include "npc/010-1-10/_import.txt" -@include "npc/010-1-11/_import.txt" -@include "npc/010-1-12/_import.txt" -@include "npc/010-1-2/_import.txt" -@include "npc/010-1-3/_import.txt" -@include "npc/010-1-4/_import.txt" -@include "npc/010-1-5/_import.txt" -@include "npc/010-1-6/_import.txt" -@include "npc/010-1-7/_import.txt" -@include "npc/010-1-8/_import.txt" -@include "npc/010-1-9/_import.txt" -@include "npc/010-1/_import.txt" -@include "npc/010-2-10/_import.txt" -@include "npc/010-2-11/_import.txt" -@include "npc/010-2-12/_import.txt" -@include "npc/010-2-13/_import.txt" -@include "npc/010-2-14/_import.txt" -@include "npc/010-2-15/_import.txt" -@include "npc/010-2-16/_import.txt" -@include "npc/010-2-2/_import.txt" -@include "npc/010-2-3/_import.txt" -@include "npc/010-2-4/_import.txt" -@include "npc/010-2-5/_import.txt" -@include "npc/010-2-6/_import.txt" -@include "npc/010-2-7/_import.txt" -@include "npc/010-2-8/_import.txt" -@include "npc/010-2-9/_import.txt" -@include "npc/010-2/_import.txt" -@include "npc/010-3/_import.txt" -@include "npc/010-4-1/_import.txt" -@include "npc/010-4-2/_import.txt" @include "npc/011-1/_import.txt" -@include "npc/011-2/_import.txt" -@include "npc/011-3/_import.txt" -@include "npc/012-1/_import.txt" -@include "npc/012-2/_import.txt" -@include "npc/012-3/_import.txt" -@include "npc/012-4/_import.txt" -@include "npc/012-5/_import.txt" -@include "npc/012-6/_import.txt" -@include "npc/012-7/_import.txt" -@include "npc/012-8/_import.txt" -@include "npc/013-1/_import.txt" -@include "npc/014-1/_import.txt" -@include "npc/014-2-1/_import.txt" -@include "npc/014-2-2/_import.txt" -@include "npc/014-2/_import.txt" -@include "npc/014-3/_import.txt" -@include "npc/014-4/_import.txt" -@include "npc/014-5-1/_import.txt" -@include "npc/014-5/_import.txt" -@include "npc/015-1/_import.txt" -@include "npc/015-2/_import.txt" -@include "npc/015-3-1/_import.txt" -@include "npc/015-3-2/_import.txt" -@include "npc/015-3-3/_import.txt" -@include "npc/015-3/_import.txt" -@include "npc/015-4/_import.txt" -@include "npc/015-5/_import.txt" -@include "npc/015-6/_import.txt" -@include "npc/015-7/_import.txt" -@include "npc/015-8-1/_import.txt" -@include "npc/015-8/_import.txt" -@include "npc/016-1/_import.txt" -@include "npc/016-6/_import.txt" -@include "npc/016-7/_import.txt" -@include "npc/017-0/_import.txt" -@include "npc/017-1/_import.txt" -@include "npc/017-10/_import.txt" -@include "npc/017-2-1/_import.txt" @include "npc/017-2-2/_import.txt" -@include "npc/017-2/_import.txt" -@include "npc/017-3/_import.txt" -@include "npc/017-4/_import.txt" -@include "npc/017-5/_import.txt" -@include "npc/017-6/_import.txt" -@include "npc/017-7/_import.txt" -@include "npc/017-8/_import.txt" -@include "npc/018-1-1/_import.txt" -@include "npc/018-1/_import.txt" @include "npc/018-2-1/_import.txt" -@include "npc/018-2-2/_import.txt" -@include "npc/018-2-3/_import.txt" -@include "npc/018-2-4/_import.txt" @include "npc/018-2-5/_import.txt" @include "npc/018-2-6/_import.txt" @include "npc/018-2-7/_import.txt" @include "npc/018-2-8/_import.txt" @include "npc/018-2/_import.txt" -@include "npc/018-3/_import.txt" -@include "npc/018-4-1/_import.txt" -@include "npc/018-4-2/_import.txt" -@include "npc/018-4/_import.txt" -@include "npc/018-5-0/_import.txt" -@include "npc/018-5-1/_import.txt" -@include "npc/018-5-2/_import.txt" -@include "npc/018-5-3/_import.txt" -@include "npc/018-5-4/_import.txt" -@include "npc/018-5-5/_import.txt" -@include "npc/018-5-boss/_import.txt" -@include "npc/018-5/_import.txt" -@include "npc/018-6-0/_import.txt" -@include "npc/018-6-1/_import.txt" -@include "npc/018-6-2/_import.txt" -@include "npc/018-6-3/_import.txt" -@include "npc/018-7-1/_import.txt" -@include "npc/018-7/_import.txt" -@include "npc/019-1-1/_import.txt" -@include "npc/019-1/_import.txt" -@include "npc/019-2/_import.txt" -@include "npc/019-3/_import.txt" -@include "npc/019-4-1/_import.txt" -@include "npc/019-4/_import.txt" -@include "npc/019-5-1/_import.txt" -@include "npc/019-5-2/_import.txt" -@include "npc/019-5-3/_import.txt" -@include "npc/019-5/_import.txt" -@include "npc/019-6/_import.txt" -@include "npc/020-1/_import.txt" -@include "npc/020-2/_import.txt" -@include "npc/020-3/_import.txt" -@include "npc/020-4/_import.txt" -@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-0/_import.txt" -@include "npc/021-1/_import.txt" -@include "npc/021-2/_import.txt" -@include "npc/021-3/_import.txt" -@include "npc/021-4/_import.txt" -@include "npc/022-1/_import.txt" -@include "npc/023-1/_import.txt" -@include "npc/023-2/_import.txt" -@include "npc/023-3-1/_import.txt" -@include "npc/023-3-2/_import.txt" -@include "npc/023-3/_import.txt" -@include "npc/023-4/_import.txt" -@include "npc/024-1/_import.txt" -@include "npc/024-10/_import.txt" -@include "npc/024-11/_import.txt" -@include "npc/024-12/_import.txt" -@include "npc/024-13/_import.txt" -@include "npc/024-14/_import.txt" -@include "npc/024-15/_import.txt" -@include "npc/024-16/_import.txt" -@include "npc/024-2/_import.txt" -@include "npc/024-3/_import.txt" -@include "npc/024-4/_import.txt" -@include "npc/024-5/_import.txt" -@include "npc/024-6/_import.txt" -@include "npc/024-7/_import.txt" -@include "npc/024-8/_import.txt" -@include "npc/024-9/_import.txt" -@include "npc/025-1/_import.txt" -@include "npc/025-2-1/_import.txt" -@include "npc/025-2-2/_import.txt" -@include "npc/025-2-3/_import.txt" -@include "npc/025-2-4/_import.txt" -@include "npc/025-2/_import.txt" -@include "npc/025-3/_import.txt" -@include "npc/026-0/_import.txt" -@include "npc/026-1/_import.txt" -@include "npc/026-2/_import.txt" -@include "npc/027-0/_import.txt" -@include "npc/027-1/_import.txt" -@include "npc/027-2/_import.txt" -@include "npc/027-3/_import.txt" -@include "npc/027-4/_import.txt" -@include "npc/027-5/_import.txt" -@include "npc/027-6/_import.txt" -@include "npc/027-7/_import.txt" -@include "npc/029-0/_import.txt" -@include "npc/029-1/_import.txt" -@include "npc/029-2/_import.txt" -@include "npc/029-3/_import.txt" -@include "npc/029-4/_import.txt" -@include "npc/029-5/_import.txt" -@include "npc/029-6/_import.txt" -@include "npc/029-7/_import.txt" -@include "npc/029-8/_import.txt" -@include "npc/029-9/_import.txt" @include "npc/030-01/_import.txt" @include "npc/030-02/_import.txt" @include "npc/030-03/_import.txt" @@ -379,37 +117,15 @@ @include "npc/031-7/_import.txt" @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" @include "npc/033-4/_import.txt" @include "npc/033-5/_import.txt" -@include "npc/034-1/_import.txt" -@include "npc/034-2/_import.txt" -@include "npc/034-3/_import.txt" -@include "npc/034-4/_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/fermi/_import.txt" @include "npc/guilds/_import.txt" @include "npc/sec_pri/_import.txt" -@include "npc/soren-2/_import.txt" -@include "npc/soren/_import.txt" @include "npc/test/_import.txt" @include "npc/testbg/_import.txt" diff --git a/npc/botcheck/_import.txt b/npc/botcheck/_import.txt index e6f4365..5f53d23 100644 --- a/npc/botcheck/_import.txt +++ b/npc/botcheck/_import.txt @@ -1,3 +1,2 @@ // Map botcheck: Botcheck Area // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/botcheck/botcheck_blackbox.txt", diff --git a/npc/fermi/_import.txt b/npc/fermi/_import.txt new file mode 100644 index 0000000..9c2eafa --- /dev/null +++ b/npc/fermi/_import.txt @@ -0,0 +1,3 @@ +// Map fermi: Three Fermi Land +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/fermi/_warps.txt", diff --git a/npc/fermi/_warps.txt b/npc/fermi/_warps.txt new file mode 100644 index 0000000..76c2131 --- /dev/null +++ b/npc/fermi/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map fermi: Three Fermi Land warps +fermi,29,19,0 warp #fermi_29_19 0,0,033-1,105,149 +fermi,21,19,0 warp #fermi_21_19 0,0,033-1,105,149 diff --git a/npc/functions/dungeon.txt b/npc/functions/dungeon.txt index 641d00d..8fa119b 100644 --- a/npc/functions/dungeon.txt +++ b/npc/functions/dungeon.txt @@ -9,9 +9,9 @@ // Main initialization OnInit: - setarray .heatmap$, "007-2"; + setarray .heatmap$, "011-1"; setarray .cursemap$, "006-4", "006-4-1", "025-1"; - setarray .sickmap$, "029-5"; + setarray .sickmap$, "018-2"; setarray .bleedmap$, "006-9"; end; @@ -152,11 +152,11 @@ OnBleed: ////////////////////////////// -007-2 mapflag nosave 007-1,99,189 -006-4 mapflag nosave 006-3,54,36 -006-4-1 mapflag nosave 006-3,54,36 -029-5 mapflag nosave 029-4,21,97 -006-9 mapflag nosave 006-6,46,27 +//007-2 mapflag nosave 033-1,72,191 +006-4 mapflag nosave 033-1,72,191 +006-4-1 mapflag nosave 033-1,72,191 +//029-5 mapflag nosave 033-1,72,191 +006-9 mapflag nosave 033-1,72,191 diff --git a/npc/functions/seasons.txt b/npc/functions/seasons.txt index dc41128..048e649 100644 --- a/npc/functions/seasons.txt +++ b/npc/functions/seasons.txt @@ -95,15 +95,9 @@ function script sChristmas { addmonsterdrop(AzulSlime, XmasGift, 2*.@m); } - // Change maps for Christmas Season (Specially LoF maps) - addmapmask "003-1", MASK_CHRISTMAS; - addmapmask "005-1", MASK_CHRISTMAS; - addmapmask "009-1", MASK_CHRISTMAS; - addmapmask "012-1", MASK_CHRISTMAS; - addmapmask "017-2", MASK_CHRISTMAS; - addmapmask "017-2-1", MASK_CHRISTMAS; - addmapmask "017-3", MASK_CHRISTMAS; - addmapmask "020-2", MASK_CHRISTMAS; + // Change maps for Christmas Season + //addmapmask "031-1", MASK_CHRISTMAS; + //addmapmask "033-1", MASK_CHRISTMAS; // Enable event set $EVENT$, "Christmas"; @@ -297,9 +291,6 @@ OnSummerEnd: end; OnAutumnStart: - // Fancy trees - addmapmask "012-1", MASK_AUTUMN; - // Autumn's Drop addmonsterdrop(FafiDragon, PumpkandySeed, 10000); addmonsterdrop(BlackMamba, PumpkandySeed, 8000); @@ -327,7 +318,6 @@ OnAutumnEnd: } - removemapmask "012-1", MASK_AUTUMN; delmonsterdrop(FafiDragon, PumpkandySeed); delmonsterdrop(Mouboo, PumpkandySeed); delmonsterdrop(AlphaMouboo, PumpkandySeed); diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt index 5c369e1..711497d 100644 --- a/npc/functions/weather.txt +++ b/npc/functions/weather.txt @@ -67,47 +67,20 @@ OnInit: .wcore = htnew; // Deserts - htput(.wcore, "003-1", "desert"); - htput(.wcore, "004-1", "desert"); - htput(.wcore, "004-2", "desert"); - htput(.wcore, "009-1", "desert"); - htput(.wcore, "010-1", "desert"); - htput(.wcore, "010-2", "desert"); - htput(.wcore, "032-1", "desert"); + //htput(.wcore, "032-1", "desert"); // Woodlands htput(.wcore, "001-4", "woodland"); htput(.wcore, "001-11", "woodland"); htput(.wcore, "001-12", "woodland"); - htput(.wcore, "005-1", "woodland"); - htput(.wcore, "012-1", "woodland"); - htput(.wcore, "014-1", "woodland"); - htput(.wcore, "014-2", "woodland"); - htput(.wcore, "014-3", "woodland"); - htput(.wcore, "014-4", "woodland"); - htput(.wcore, "014-5", "woodland"); - htput(.wcore, "017-1", "woodland"); - htput(.wcore, "018-1", "woodland"); htput(.wcore, "018-2", "woodland"); - htput(.wcore, "018-4", "woodland"); - htput(.wcore, "018-5", "woodland"); - htput(.wcore, "027-1", "woodland"); // Icelands - htput(.wcore, "001-7", "iceland"); - htput(.wcore, "019-1", "iceland"); - htput(.wcore, "019-2", "iceland"); - htput(.wcore, "019-3", "iceland"); - htput(.wcore, "019-4", "iceland"); - htput(.wcore, "019-5", "iceland"); - htput(.wcore, "019-6", "iceland"); - htput(.wcore, "020-1", "iceland"); - htput(.wcore, "022-1", "iceland"); - htput(.wcore, "024-1", "iceland"); htput(.wcore, "031-1", "iceland"); + htput(.wcore, "033-1", "iceland"); // Special - htput(.wcore, "011-3", "special"); + //htput(.wcore, "011-3", "special"); consoleinfo "[Weather.sys] Total Maps = " + htsize(.wcore); diff --git a/npc/guilds/_warps.txt b/npc/guilds/_warps.txt index 6e8c8f6..ad79521 100644 --- a/npc/guilds/_warps.txt +++ b/npc/guilds/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map guilds: Guild Hall warps -guilds,35,49,0 warp #guilds_35_49 1,0,017-1,57,34 +guilds,35,49,0 warp #guilds_35_49 1,0,033-1,134,80 diff --git a/npc/items/shovel.txt b/npc/items/shovel.txt index ed1f464..07da98a 100644 --- a/npc/items/shovel.txt +++ b/npc/items/shovel.txt @@ -289,16 +289,7 @@ OnInit: .PlayerTiredTime = 25; // You can bury & dig on all mines - AddDigRect("007-1", 20, 20, 180, 190); AddDigRect("011-1", 20, 20, 180, 180); - AddDigRect("015-1", 20, 20, 180, 180); - AddDigRect("032-2", 20, 20, 180, 180); - - // Aeros can be used too (for events) - AddDigRect("001-1", 20, 20, 342, 158); - - // LoF Areas - AddDigRect("018-1", 20, 20, 80, 80); OnHour00: // Clear random treasure @@ -308,48 +299,6 @@ OnHour00: deletearray $@WBT_Random_x; deletearray $@WBT_Random_y; - - // Scatter Treasure. - // There are 25600 possible cells, and about 60% of them are collisions. - // As we don't prevent treasure from falling on collision, it is pretty high. - // If two treasures fall on same place, the previous treasure will be ignored. - // Theoretical chance of uncovering a treasure on an attempt is 0.12% to 0.70% - // 2019-05-27: Doubled ammount of treasures. New rates should be 0.24% ~ 1.40% - shovel_scatter("007-1", 20, 20, 180, 180, rand(60,360), - TreasureKey,CoinBag,TreasureKey,SulfurPowder,Coal,EarthPowder, - IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, - Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst, - CursedAmmoBox,ThornAmmoBox,SacredBullet); - shovel_scatter("011-1", 20, 20, 180, 180, rand(60,360), - TreasureKey,CoinBag,TreasureKey,SulfurPowder,Coal,EarthPowder, - IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, - Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst, - CursedAmmoBox,ThornAmmoBox,SacredBullet); - shovel_scatter("015-1", 20, 20, 180, 180, rand(60,360), - TreasureKey,CoinBag,TreasureKey,SulfurPowder,Coal,EarthPowder, - IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, - Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst, - CursedAmmoBox,ThornAmmoBox,SacredBullet); - - // Extra burried treasure (25~65 over 3600 tiles: aprox. 0.70% to 1.80%) - // New Rate: 1.40% ~ 3.60% since 2019-05-27 - shovel_scatter("018-1", 20, 20, 80, 80, rand(50,130), - TreasureKey,CoinBag,TreasureKey,SulfurPowder,Coal,EarthPowder, - IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, - Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst, - CursedAmmoBox,ThornAmmoBox,SacredBullet); - - // Aeros can't be forgotten, but only during Thanksgiving - if ($EVENT$ == "Thanksgiving") { - shovel_scatter("001-1", 171, 20, 340, 160, rand(160,360), - TreasureKey,CoinBag,TreasureKey,SulfurPowder,Coal,EarthPowder, - IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, - Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst); - shovel_scatter("001-1", 20, 20, 140, 140, rand(160,360), - TreasureKey,CoinBag,TreasureKey,SulfurPowder,Coal,EarthPowder, - IronOre,CopperOre,LeadOre,TinOre,SilverOre,GoldOre,PlatinumOre,IridiumOre,TitaniumOre, - Diamond,Ruby,Emerald,Sapphire,Topaz,Amethyst); - } end; } @@ -451,11 +400,7 @@ function script shovel_randomtreasure { } function script shovel_genrandtreasure { - if (getq(LoFQuest_EPISODE) >= 16) - .@m$=any("007-1", "011-1", "015-1", "018-1", "032-2", - "007-1", "011-1", "015-1", "018-1"); - else - .@m$=any("007-1", "011-1", "015-1", "018-1"); + .@m$=any("011-1"); // Dangerous do { .@x=rand2(20, getmapinfo(MAPINFO_SIZE_X, .@m$)-20); @@ -521,11 +466,7 @@ function script shovel_randomdungeon { } function script shovel_genranddungeon { - if (getq(LoFQuest_EPISODE) >= 16) - .@m$=any("007-1", "011-1", "015-1", "018-1", "032-2", - "007-1", "011-1", "015-1", "018-1"); - else - .@m$=any("007-1", "011-1", "015-1", "018-1"); + .@m$=any("011-1"); // Dangerous do { .@x=rand2(20, getmapinfo(MAPINFO_SIZE_X, .@m$)-20); diff --git a/npc/scripts.conf b/npc/scripts.conf index e51c7e4..71d2f60 100644 --- a/npc/scripts.conf +++ b/npc/scripts.conf @@ -143,14 +143,10 @@ // These are to be proccessed later "npc/functions/clientversion.txt", -"npc/functions/estate2.txt", "npc/functions/hub.txt", -"npc/functions/mkbot.txt", -"npc/functions/gmbot.txt", "npc/functions/instances.txt", "npc/functions/captcha.txt", "npc/functions/dungeon.txt", -"npc/config/easteregg_blackbox.txt", // Maps specific scripts @include "npc/_import.txt" -- cgit v1.2.3-70-g09d2