summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjesusalva <cpntb1@ymail.com>2018-02-16 17:05:54 -0200
committerjesusalva <cpntb1@ymail.com>2018-02-16 17:05:54 -0200
commitc1b87bf0d27f87977a0edc6e18d980f726e53def (patch)
tree5bd2139f1fe6dc5e534a4a3bc750b0ea733f147b
parente782c2a7adb7ae071cbdff7bba86be4236d3c45a (diff)
downloadserverdata-c1b87bf0d27f87977a0edc6e18d980f726e53def.tar.gz
serverdata-c1b87bf0d27f87977a0edc6e18d980f726e53def.tar.bz2
serverdata-c1b87bf0d27f87977a0edc6e18d980f726e53def.tar.xz
serverdata-c1b87bf0d27f87977a0edc6e18d980f726e53def.zip
Include the floating island of Aeros
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt5
-rwxr-xr-xdb/re/map_cache.datbin23264 -> 24062 bytes
-rw-r--r--npc/_import.txt1
-rw-r--r--npc/aeros/_import.txt2
-rw-r--r--npc/commands/warp.txt5
6 files changed, 11 insertions, 3 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index f1cc377b5..7f075fff7 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -100,6 +100,7 @@ map_list: (
"008-2-7",
"008-2-8",
"008-2-9",
+ "aeros",
"test",
"testbg",
)
diff --git a/db/map_index.txt b/db/map_index.txt
index 2f7af185a..485370b36 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -97,5 +97,6 @@
008-2-7 97
008-2-8 98
008-2-9 99
-test 100
-testbg 101
+aeros 100
+test 101
+testbg 102
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index 82f3fc4a2..7258f0655 100755
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
Binary files differ
diff --git a/npc/_import.txt b/npc/_import.txt
index eb8110c79..c5fd0ffc5 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -99,5 +99,6 @@
@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
new file mode 100644
index 000000000..c82ca8a87
--- /dev/null
+++ b/npc/aeros/_import.txt
@@ -0,0 +1,2 @@
+// Map aeros: Floating Kingdom 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 b5436b7f9..48e1fd01f 100644
--- a/npc/commands/warp.txt
+++ b/npc/commands/warp.txt
@@ -63,7 +63,7 @@ OnInit:
setarray .aliases$[0],
// ARTIS
- "^ARTIS", "001-1 89 86", // artis town square
+ "^ARTIS", "001-1 89 86", // artis town square
// PROLOGUE
"^START|^BEGIN", "000-0 22 24", // starting point
@@ -72,6 +72,9 @@ OnInit:
"^TULIM", "003-1 41 48", // Tulishmar
"^CANDOR", "005-1 28 92", // Tulishmar
+ // TMW-BR
+ "^AEROS", "aeros 76 26", // Floating Island of Aeros (GM Events)
+
// WOODLAND
"^HURN", "008-1 79 64"; // hurnscald: town square