summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2012-02-12 13:55:49 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2012-03-29 14:58:52 +0200
commit70a3701f985ff18dc62ecf8b656748cc327b9f73 (patch)
treec9c98ccbade1551407adecef1f45a3dc2bce2098
parentfb8c3c050a98cd13daf776112929ffb149fbcc25 (diff)
downloadserverdata-70a3701f985ff18dc62ecf8b656748cc327b9f73.tar.gz
serverdata-70a3701f985ff18dc62ecf8b656748cc327b9f73.tar.bz2
serverdata-70a3701f985ff18dc62ecf8b656748cc327b9f73.tar.xz
serverdata-70a3701f985ff18dc62ecf8b656748cc327b9f73.zip
Adding new map 048-2 by running the converter. Submodule pointer updated.
m---------client-data0
-rw-r--r--world/map/data/048-2.wlkbin0 -> 48404 bytes
-rw-r--r--world/map/data/resnametable.txt1
-rw-r--r--world/map/npc/048-2/_import.txt6
-rw-r--r--world/map/npc/048-2/_mobs.txt8
-rw-r--r--world/map/npc/048-2/_warps.txt19
-rw-r--r--world/map/npc/_import.txt1
7 files changed, 35 insertions, 0 deletions
diff --git a/client-data b/client-data
-Subproject b1d705251c2784d8b585f629202164746b1379b
+Subproject 17717acaefdf343133bbd14ab55bf2d89e222d7
diff --git a/world/map/data/048-2.wlk b/world/map/data/048-2.wlk
new file mode 100644
index 00000000..3d3e413e
--- /dev/null
+++ b/world/map/data/048-2.wlk
Binary files differ
diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt
index 746dfadc..5cbbfaad 100644
--- a/world/map/data/resnametable.txt
+++ b/world/map/data/resnametable.txt
@@ -84,4 +84,5 @@
044-1.gat#044-1.wlk#
044-3.gat#044-3.wlk#
045-1.gat#045-1.wlk#
+048-2.gat#048-2.wlk#
botcheck.gat#botcheck.wlk#
diff --git a/world/map/npc/048-2/_import.txt b/world/map/npc/048-2/_import.txt
new file mode 100644
index 00000000..bcdb8d76
--- /dev/null
+++ b/world/map/npc/048-2/_import.txt
@@ -0,0 +1,6 @@
+// Map 048-2: Blue Sages' Mansion
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 048-2.gat
+npc: npc/048-2/_mobs.txt
+npc: npc/048-2/_warps.txt
+npc: npc/048-2/npcs.txt
diff --git a/world/map/npc/048-2/_mobs.txt b/world/map/npc/048-2/_mobs.txt
new file mode 100644
index 00000000..6aa368b2
--- /dev/null
+++ b/world/map/npc/048-2/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Blue Sages' Mansion mobs
+
+
+
+048-2.gat,0,0,0|script|Mob048-2|-1,{
+ end;
+}
diff --git a/world/map/npc/048-2/_warps.txt b/world/map/npc/048-2/_warps.txt
new file mode 100644
index 00000000..d183eacc
--- /dev/null
+++ b/world/map/npc/048-2/_warps.txt
@@ -0,0 +1,19 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Blue Sages' Mansion warps
+
+048-2.gat,22,78|warp|To Second Floor|0,-1,048-2.gat,84,23
+048-2.gat,60,21|warp|To Second Floor|0,-1,048-2.gat,121,26
+048-2.gat,84,21|warp|To Third Floor|0,-1,048-2.gat,22,76
+048-2.gat,113,23|warp|To Office|-1,-1,048-2.gat,147,35
+048-2.gat,122,28|warp|To First Floor|0,-1,048-2.gat,59,22
+048-2.gat,95,23|warp|To Office|-1,-1,048-2.gat,178,35
+048-2.gat,147,36|warp|To Corridor|-1,-1,048-2.gat,113,24
+048-2.gat,178,36|warp|To Corridor|-1,-1,048-2.gat,95,24
+048-2.gat,27,141|warp|To Corridor|-1,-1,048-2.gat,52,102
+048-2.gat,60,71|warp|To Fourth Floor|0,-1,048-2.gat,60,104
+048-2.gat,23,73|warp|To Library|-1,-1,048-2.gat,85,132
+048-2.gat,55,73|warp|To Library|-1,-1,048-2.gat,121,132
+048-2.gat,61,106|warp|To Third Floor|0,-1,048-2.gat,59,73
+048-2.gat,52,101|warp|To Bedroom|-1,-1,048-2.gat,27,140
+048-2.gat,121,133|warp|To Corridor|-1,-1,048-2.gat,55,74
+048-2.gat,85,133|warp|To Corridor|-1,-1,048-2.gat,23,74
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index ffa22921..6803bb6f 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -84,4 +84,5 @@ import: npc/042-2/_import.txt
import: npc/044-1/_import.txt
import: npc/044-3/_import.txt
import: npc/045-1/_import.txt
+import: npc/048-2/_import.txt
import: npc/botcheck/_import.txt