From 3295f6c46909ee4e36c946165d366b9c02f51a2a Mon Sep 17 00:00:00 2001 From: jesusalva Date: Mon, 26 Feb 2018 18:38:46 -0300 Subject: GM Island (via @w gm or @w Aeros). Currently a work in progress. --- npc/001-1/_import.txt | 3 +++ npc/001-1/mapflags.txt | 1 + npc/_import.txt | 2 +- npc/aeros/_import.txt | 2 -- npc/commands/warp.txt | 3 ++- 5 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 npc/001-1/_import.txt create mode 100644 npc/001-1/mapflags.txt delete mode 100644 npc/aeros/_import.txt (limited to 'npc') diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt new file mode 100644 index 000000000..1c524da11 --- /dev/null +++ b/npc/001-1/_import.txt @@ -0,0 +1,3 @@ +// Map 001-1: Floating Island of Aeros +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/001-1/mapflags.txt", diff --git a/npc/001-1/mapflags.txt b/npc/001-1/mapflags.txt new file mode 100644 index 000000000..1aeaed1e8 --- /dev/null +++ b/npc/001-1/mapflags.txt @@ -0,0 +1 @@ +001-1 mapflag nosave 002-1,53,38 diff --git a/npc/_import.txt b/npc/_import.txt index a8988caff..cca29abf5 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -3,6 +3,7 @@ @include "npc/000-0-0/_import.txt" @include "npc/000-0/_import.txt" @include "npc/000-1/_import.txt" +@include "npc/001-1/_import.txt" @include "npc/002-1/_import.txt" @include "npc/002-2/_import.txt" @include "npc/002-3/_import.txt" @@ -47,6 +48,5 @@ @include "npc/008-2-7/_import.txt" @include "npc/008-2-8/_import.txt" @include "npc/008-2-9/_import.txt" -@include "npc/aeros/_import.txt" @include "npc/test/_import.txt" @include "npc/testbg/_import.txt" diff --git a/npc/aeros/_import.txt b/npc/aeros/_import.txt deleted file mode 100644 index dff8755f6..000000000 --- a/npc/aeros/_import.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Map aeros: Floating Island of Aeros -// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/commands/warp.txt b/npc/commands/warp.txt index 35af43406..1e5a2b379 100644 --- a/npc/commands/warp.txt +++ b/npc/commands/warp.txt @@ -70,7 +70,8 @@ OnInit: "^CANDOR", "005-1 28 92", // Tulishmar // TMW-BR - "^AEROS", "aeros 76 26", // Floating Island of Aeros (GM Events) + "^AEROS", "001-1 235 26", // Floating Island of Aeros (GM Events) + "^GM", "001-1 235 26", // Floating Island of Aeros (GM Events) // WOODLAND "^HURN", "008-1 79 64"; // hurnscald: town square -- cgit v1.2.3-70-g09d2