summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-11-29 18:09:59 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2011-12-08 16:18:50 +0100
commita71ae4883c221690510aed5ab438cd39d21919ad (patch)
tree22c905ddec0c726b2010f7a9fc309cdaac641492
parentac4d6f440e2ac25610b6cc54eac561719052cce9 (diff)
downloadserverdata-a71ae4883c221690510aed5ab438cd39d21919ad.tar.gz
serverdata-a71ae4883c221690510aed5ab438cd39d21919ad.tar.bz2
serverdata-a71ae4883c221690510aed5ab438cd39d21919ad.tar.xz
serverdata-a71ae4883c221690510aed5ab438cd39d21919ad.zip
Adding Christmas map 030-2. Submodule pointer updated.
m---------client-data0
-rw-r--r--world/map/data/030-2.wlkbin0 -> 28604 bytes
-rw-r--r--world/map/npc/030-2/_import.txt5
-rw-r--r--world/map/npc/030-2/_mobs.txt8
-rw-r--r--world/map/npc/030-2/_warps.txt17
-rw-r--r--world/map/npc/_import.txt1
6 files changed, 31 insertions, 0 deletions
diff --git a/client-data b/client-data
-Subproject 06e627ea86582685883458bfb0ea7e3c3cdaebf
+Subproject 410e599cce359f483c322ff730d6068ca25f854
diff --git a/world/map/data/030-2.wlk b/world/map/data/030-2.wlk
new file mode 100644
index 00000000..95b41f9d
--- /dev/null
+++ b/world/map/data/030-2.wlk
Binary files differ
diff --git a/world/map/npc/030-2/_import.txt b/world/map/npc/030-2/_import.txt
new file mode 100644
index 00000000..9c5c854d
--- /dev/null
+++ b/world/map/npc/030-2/_import.txt
@@ -0,0 +1,5 @@
+// Map 030-2: Christmas Inn
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 030-2.gat
+npc: npc/030-2/_mobs.txt
+npc: npc/030-2/_warps.txt
diff --git a/world/map/npc/030-2/_mobs.txt b/world/map/npc/030-2/_mobs.txt
new file mode 100644
index 00000000..29bcc3c9
--- /dev/null
+++ b/world/map/npc/030-2/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Christmas Inn mobs
+
+
+
+030-2.gat,0,0,0|script|Mob030-2|-1,{
+ end;
+}
diff --git a/world/map/npc/030-2/_warps.txt b/world/map/npc/030-2/_warps.txt
new file mode 100644
index 00000000..edcb7e1b
--- /dev/null
+++ b/world/map/npc/030-2/_warps.txt
@@ -0,0 +1,17 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Christmas Inn warps
+
+030-2.gat,88,51|warp|To Outside|-1,-1,030-1.gat,99,54
+030-2.gat,72,31|warp|To Basement|-1,-1,030-2.gat,51,31
+030-2.gat,194,68|warp|To Fourth Floor|-1,-1,030-2.gat,78,88
+030-2.gat,52,31|warp|To First Floor|-1,-1,030-2.gat,73,31
+030-2.gat,75,19|warp|To Second Floor|0,-1,030-2.gat,127,50
+030-2.gat,102,19|warp|To Second Floor|0,-1,030-2.gat,153,50
+030-2.gat,127,51|warp|To First Floor|0,-1,030-2.gat,75,20
+030-2.gat,154,51|warp|To First Floor|0,-1,030-2.gat,101,20
+030-2.gat,156,24|warp|To Third Floor|-1,0,030-2.gat,21,78
+030-2.gat,20,78|warp|To Second Floor|-1,0,030-2.gat,155,24
+030-2.gat,42,105|warp|To Fourth Floor|0,-1,030-2.gat,93,74
+030-2.gat,94,73|warp|To Third Floor|0,-1,030-2.gat,41,104
+030-2.gat,102,73|warp|To Fifth Floor|0,-1,030-2.gat,127,104
+030-2.gat,127,105|warp|To Fourth Floor|0,-1,030-2.gat,102,74
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index 45637889..623dd490 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -69,6 +69,7 @@ import: npc/028-3/_import.txt
import: npc/029-1/_import.txt
import: npc/029-3/_import.txt
import: npc/030-1/_import.txt
+import: npc/030-2/_import.txt
import: npc/031-1/_import.txt
import: npc/031-2/_import.txt
import: npc/031-3/_import.txt