From 4df8bc5cb4348dfab41d5a1904934180df46e637 Mon Sep 17 00:00:00 2001 From: gumi Date: Wed, 17 Jan 2018 16:06:33 -0500 Subject: add underworld, abyss --- world/map/data/070-1.wlk | Bin 0 -> 22804 bytes world/map/data/070-3.wlk | Bin 0 -> 8467 bytes world/map/data/resnametable.txt | 2 ++ world/map/npc/001-2/_nodes.txt | 2 +- world/map/npc/070-1/_import.txt | 6 ++++++ world/map/npc/070-1/_mobs.txt | 3 +++ world/map/npc/070-1/_nodes.txt | 4 ++++ world/map/npc/070-1/_warps.txt | 3 +++ world/map/npc/070-3/_import.txt | 6 ++++++ world/map/npc/070-3/_mobs.txt | 3 +++ world/map/npc/070-3/_nodes.txt | 4 ++++ world/map/npc/070-3/_warps.txt | 3 +++ world/map/npc/_import.txt | 2 ++ world/map/npc/functions/gm_island.txt | 6 +++++- 14 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 world/map/data/070-1.wlk create mode 100644 world/map/data/070-3.wlk create mode 100644 world/map/npc/070-1/_import.txt create mode 100644 world/map/npc/070-1/_mobs.txt create mode 100644 world/map/npc/070-1/_nodes.txt create mode 100644 world/map/npc/070-1/_warps.txt create mode 100644 world/map/npc/070-3/_import.txt create mode 100644 world/map/npc/070-3/_mobs.txt create mode 100644 world/map/npc/070-3/_nodes.txt create mode 100644 world/map/npc/070-3/_warps.txt (limited to 'world') diff --git a/world/map/data/070-1.wlk b/world/map/data/070-1.wlk new file mode 100644 index 00000000..6d0076dc Binary files /dev/null and b/world/map/data/070-1.wlk differ diff --git a/world/map/data/070-3.wlk b/world/map/data/070-3.wlk new file mode 100644 index 00000000..4c5f45da Binary files /dev/null and b/world/map/data/070-3.wlk differ diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt index 99852a33..b5fd99cc 100644 --- a/world/map/data/resnametable.txt +++ b/world/map/data/resnametable.txt @@ -104,4 +104,6 @@ 055-3#055-3.wlk# 056-2#056-2.wlk# 057-1#057-1.wlk# +070-1#070-1.wlk# +070-3#070-3.wlk# botcheck#botcheck.wlk# diff --git a/world/map/npc/001-2/_nodes.txt b/world/map/npc/001-2/_nodes.txt index 5a5cdeac..83a8fce0 100644 --- a/world/map/npc/001-2/_nodes.txt +++ b/world/map/npc/001-2/_nodes.txt @@ -7,7 +7,7 @@ OnInit: setarray .m$, "_N-Alchemy", "001-2", "001-2", "001-2", "001-2"; setarray .x1, "_N-Alchemy", 98, 92, 98, 92; - setarray .y1, "_N-Alchemy", 76, 76, 89, 89; + setarray .y1, "_N-Alchemy", 89, 89, 76, 76; setarray .x2, "_N-Alchemy", 0, 0, 0, 0; setarray .y2, "_N-Alchemy", 0, 0, 0, 0; setarray .id, "_N-Alchemy", 0, 0, 0, 0; diff --git a/world/map/npc/070-1/_import.txt b/world/map/npc/070-1/_import.txt new file mode 100644 index 00000000..e72c5a98 --- /dev/null +++ b/world/map/npc/070-1/_import.txt @@ -0,0 +1,6 @@ +// Map 070-1: Underworld +// This file is generated automatically. All manually added changes will be removed when running the Converter. +map: 070-1 +npc: npc/070-1/_mobs.txt +npc: npc/070-1/_nodes.txt +npc: npc/070-1/_warps.txt diff --git a/world/map/npc/070-1/_mobs.txt b/world/map/npc/070-1/_mobs.txt new file mode 100644 index 00000000..5227e3aa --- /dev/null +++ b/world/map/npc/070-1/_mobs.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Underworld mobs + diff --git a/world/map/npc/070-1/_nodes.txt b/world/map/npc/070-1/_nodes.txt new file mode 100644 index 00000000..4ee02269 --- /dev/null +++ b/world/map/npc/070-1/_nodes.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Underworld nodes + +// (no nodes) diff --git a/world/map/npc/070-1/_warps.txt b/world/map/npc/070-1/_warps.txt new file mode 100644 index 00000000..3ea59e07 --- /dev/null +++ b/world/map/npc/070-1/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Underworld warps + diff --git a/world/map/npc/070-3/_import.txt b/world/map/npc/070-3/_import.txt new file mode 100644 index 00000000..fbb44538 --- /dev/null +++ b/world/map/npc/070-3/_import.txt @@ -0,0 +1,6 @@ +// Map 070-3: The Abyss +// This file is generated automatically. All manually added changes will be removed when running the Converter. +map: 070-3 +npc: npc/070-3/_mobs.txt +npc: npc/070-3/_nodes.txt +npc: npc/070-3/_warps.txt diff --git a/world/map/npc/070-3/_mobs.txt b/world/map/npc/070-3/_mobs.txt new file mode 100644 index 00000000..fa8157f8 --- /dev/null +++ b/world/map/npc/070-3/_mobs.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// The Abyss mobs + diff --git a/world/map/npc/070-3/_nodes.txt b/world/map/npc/070-3/_nodes.txt new file mode 100644 index 00000000..8cc635b6 --- /dev/null +++ b/world/map/npc/070-3/_nodes.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// The Abyss nodes + +// (no nodes) diff --git a/world/map/npc/070-3/_warps.txt b/world/map/npc/070-3/_warps.txt new file mode 100644 index 00000000..f7b8e16a --- /dev/null +++ b/world/map/npc/070-3/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// The Abyss warps + diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt index 66c59de1..ab56f08d 100644 --- a/world/map/npc/_import.txt +++ b/world/map/npc/_import.txt @@ -106,4 +106,6 @@ import: npc/055-1/_import.txt import: npc/055-3/_import.txt import: npc/056-2/_import.txt import: npc/057-1/_import.txt +import: npc/070-1/_import.txt +import: npc/070-3/_import.txt import: npc/botcheck/_import.txt diff --git a/world/map/npc/functions/gm_island.txt b/world/map/npc/functions/gm_island.txt index 97fd8230..50fe9c8c 100644 --- a/world/map/npc/functions/gm_island.txt +++ b/world/map/npc/functions/gm_island.txt @@ -15,6 +15,8 @@ function|script|GmWarp if ($@GM_EVENT_WARP == 2) warp "028-1", 119, 74; if ($@GM_EVENT_WARP == 3) warp "028-3", 68, 36; if ($@GM_EVENT_WARP == 4) warp "001-3", 0, 0; + if ($@GM_EVENT_WARP == 5) warp "070-1", 30, 92; + if ($@GM_EVENT_WARP == 6) warp "070-3", 60, 63; return; } function|script|GmDebug @@ -32,7 +34,9 @@ L_GmChoose: "GM Island (entrance)", L_GmStart, "GM Island (auditorium)", L_GmStart, "GM Island (cave)", L_GmStart, - "Tulimshar Arena", L_GmStart; + "Tulimshar Arena", L_GmStart, + "Underworld", L_GmStart, + "The Abyss", L_GmStart; L_GmStart: set $@GM_EVENT_WARP, @menu; -- cgit v1.2.3-60-g2f50