From d0386d85b337dbd76870e78fd449138574755da5 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 22 Feb 2020 01:50:14 -0300 Subject: There's now a lobby room for Candor Arena. --- npc/005-1/_import.txt | 2 +- npc/005-1/underground.txt | 12 ++++++++++++ npc/005-1/warpcandorbattle.txt | 17 ----------------- npc/006-0/_import.txt | 2 ++ npc/006-0/_warps.txt | 3 +++ npc/006-0/warpcandorbattle.txt | 17 +++++++++++++++++ npc/006-1/barrier.txt | 2 +- 7 files changed, 36 insertions(+), 19 deletions(-) create mode 100644 npc/005-1/underground.txt delete mode 100644 npc/005-1/warpcandorbattle.txt create mode 100644 npc/006-0/_warps.txt create mode 100644 npc/006-0/warpcandorbattle.txt diff --git a/npc/005-1/_import.txt b/npc/005-1/_import.txt index bbd950b67..84542811c 100644 --- a/npc/005-1/_import.txt +++ b/npc/005-1/_import.txt @@ -9,7 +9,7 @@ "npc/005-1/sailors.txt", "npc/005-1/ship.txt", "npc/005-1/soul-menhir.txt", +"npc/005-1/underground.txt", "npc/005-1/vincent.txt", -"npc/005-1/warpcandorbattle.txt", "npc/005-1/wateranimation.txt", "npc/005-1/zegas.txt", diff --git a/npc/005-1/underground.txt b/npc/005-1/underground.txt new file mode 100644 index 000000000..ba721aaa6 --- /dev/null +++ b/npc/005-1/underground.txt @@ -0,0 +1,12 @@ +// TMW2 Script +// Author: +// Crazyfefe +// Jesusalva + +005-1,66,62,0 script Magic Barrier NPC_HIDDEN,0,0,{ + end; + +OnTouch: + warp "006-0", 49, 53; + end; +} diff --git a/npc/005-1/warpcandorbattle.txt b/npc/005-1/warpcandorbattle.txt deleted file mode 100644 index d7af54df4..000000000 --- a/npc/005-1/warpcandorbattle.txt +++ /dev/null @@ -1,17 +0,0 @@ -// TMW2 Script -// Author: -// Crazyfefe -// Jesusalva - -005-1,66,62,0 script Magic Barrier NPC_HIDDEN,0,0,{ - end; - -OnTouch: - if (BaseLevel >= 20 && !$@FEFE_CAVE_LEVEL) - warp "006-1", 49, 53; - else if (BaseLevel < 20) - npctalk3 l("You don't have the required level to pass this barrier."); - else - npctalk3 l("You can't pass this barrier while people are fighting inside!"); - end; -} diff --git a/npc/006-0/_import.txt b/npc/006-0/_import.txt index 4957943c3..8e1618778 100644 --- a/npc/006-0/_import.txt +++ b/npc/006-0/_import.txt @@ -1,2 +1,4 @@ // Map 006-0: Candor's Underground, 1F // This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/006-0/_warps.txt", +"npc/006-0/warpcandorbattle.txt", diff --git a/npc/006-0/_warps.txt b/npc/006-0/_warps.txt new file mode 100644 index 000000000..42c187325 --- /dev/null +++ b/npc/006-0/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 006-0: Candor's Underground, 1F warps +006-0,49,54,0 warp #006-0_49_54 0,0,005-1,66,63 diff --git a/npc/006-0/warpcandorbattle.txt b/npc/006-0/warpcandorbattle.txt new file mode 100644 index 000000000..20ef44ee2 --- /dev/null +++ b/npc/006-0/warpcandorbattle.txt @@ -0,0 +1,17 @@ +// TMW2 Script +// Author: +// Crazyfefe +// Jesusalva + +006-0,54,35,0 script Magic Barrier NPC_HIDDEN,0,0,{ + end; + +OnTouch: + if (BaseLevel >= 20 && !$@FEFE_CAVE_LEVEL) + warp "006-1", 49, 53; + else if (BaseLevel < 20) + npctalk3 l("You don't have the required level to pass this barrier."); + else + npctalk3 l("You can't pass this barrier while people are fighting inside!"); + end; +} diff --git a/npc/006-1/barrier.txt b/npc/006-1/barrier.txt index bbf8a102b..da4ca36d7 100644 --- a/npc/006-1/barrier.txt +++ b/npc/006-1/barrier.txt @@ -5,7 +5,7 @@ 006-1,49,54,0 script #FightCaveBarrier NPC_NO_SPRITE,0,0,{ if ($@FEFE_CAVE_LEVEL) goto L_Block; - warp "005-1", 66, 63; + warp "006-0", 54, 36; end; L_Block: -- cgit v1.2.3-60-g2f50