summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorjesusalva <cpntb1@ymail.com>2018-02-26 18:38:46 -0300
committerjesusalva <cpntb1@ymail.com>2018-02-26 18:38:46 -0300
commit3295f6c46909ee4e36c946165d366b9c02f51a2a (patch)
treedfc0f05e63a82d1d8c795f8d756ea8170458159e /npc
parenta45752d9d80e93d28c9a3bc76be90c7e82684842 (diff)
downloadserverdata-3295f6c46909ee4e36c946165d366b9c02f51a2a.tar.gz
serverdata-3295f6c46909ee4e36c946165d366b9c02f51a2a.tar.bz2
serverdata-3295f6c46909ee4e36c946165d366b9c02f51a2a.tar.xz
serverdata-3295f6c46909ee4e36c946165d366b9c02f51a2a.zip
GM Island (via @w gm or @w Aeros). Currently a work in progress.
Diffstat (limited to 'npc')
-rw-r--r--npc/001-1/_import.txt (renamed from npc/aeros/_import.txt)3
-rw-r--r--npc/001-1/mapflags.txt1
-rw-r--r--npc/_import.txt2
-rw-r--r--npc/commands/warp.txt3
4 files changed, 6 insertions, 3 deletions
diff --git a/npc/aeros/_import.txt b/npc/001-1/_import.txt
index dff8755f6..1c524da11 100644
--- a/npc/aeros/_import.txt
+++ b/npc/001-1/_import.txt
@@ -1,2 +1,3 @@
-// Map aeros: Floating Island of Aeros
+// 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/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