From 89923e0eb25553cc56fee628a4574b2cbce74d55 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 7 Dec 2021 23:39:38 -0300 Subject: Fix a couple bugs and typos --- npc/081-1/_import.txt | 3 ++- npc/081-1/_warps.txt | 3 +++ npc/081-1/dungeon.txt | 3 +++ npc/annuals/xmas/2021.txt | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 npc/081-1/_warps.txt diff --git a/npc/081-1/_import.txt b/npc/081-1/_import.txt index 37fd1add..9d0112e7 100644 --- a/npc/081-1/_import.txt +++ b/npc/081-1/_import.txt @@ -1,3 +1,4 @@ // Map 081-1: Aethyr -// This file is generated automatically... All manually added changes will be removed when running the Converter. +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/081-1/_warps.txt", "npc/081-1/dungeon.txt", diff --git a/npc/081-1/_warps.txt b/npc/081-1/_warps.txt new file mode 100644 index 00000000..23e20359 --- /dev/null +++ b/npc/081-1/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 081-1: Aethyr warps +081-1,58,104,0 warp #081-1_58_104 0,0,020-1,84,75 diff --git a/npc/081-1/dungeon.txt b/npc/081-1/dungeon.txt index fd3b61b8..fbc20c60 100644 --- a/npc/081-1/dungeon.txt +++ b/npc/081-1/dungeon.txt @@ -70,6 +70,7 @@ OnInit: mesn; mesq l("He is worried with Gak, and we are worried with him; The Sages of Kaizei specialize in transport magic, not on combat magic. If brave adventurers could help him..."); next; + if (X21_START()) break; select l("Why don't you go yourself?"), l("Don't worry, I'll help."), @@ -93,6 +94,7 @@ OnInit: next; mesn; mesq l("I can warp you to where Santa is once you're ready. Be prepared. I believe the place is called... %s.", b(l("The Frontier Of Existence"))); + next; } break; case 4: @@ -107,6 +109,7 @@ OnInit: next; mesn; mesq l("Just be careful, I never even heard about æther before Santa decided to help Gak, so I'm pretty sure the regular magic laws are worthless past this point."); + next; break; } } while (@menu != 3); diff --git a/npc/annuals/xmas/2021.txt b/npc/annuals/xmas/2021.txt index 9ece85f6..c6ff3302 100644 --- a/npc/annuals/xmas/2021.txt +++ b/npc/annuals/xmas/2021.txt @@ -21,6 +21,7 @@ function script X21_START { } function script X21_DOSTART { XMAS2021 = (XMAS2021 | X21_ACCEPTED); + return; } function script X21BC1_CLEAR { -- cgit v1.2.3-60-g2f50