summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2012-03-17 16:54:41 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2012-03-17 19:31:32 +0100
commitbce18dcc973dcd7131194a1b1ff946c84b20eabb (patch)
tree8e0b2aafd3450572b9b3c9d667daa48d79ab1299
parent7268f5ea71824461a6a7457a6f294e8e7b1db0ae (diff)
downloadserverdata-bce18dcc973dcd7131194a1b1ff946c84b20eabb.tar.gz
serverdata-bce18dcc973dcd7131194a1b1ff946c84b20eabb.tar.bz2
serverdata-bce18dcc973dcd7131194a1b1ff946c84b20eabb.tar.xz
serverdata-bce18dcc973dcd7131194a1b1ff946c84b20eabb.zip
Adding new room to 021-2, warp into the room will be done conditionally in a script. Submodule pointer updated.
m---------client-data0
-rw-r--r--world/map/data/021-2.wlkbin40004 -> 40004 bytes
-rw-r--r--world/map/npc/021-2/_warps.txt1
3 files changed, 1 insertions, 0 deletions
diff --git a/client-data b/client-data
-Subproject 6cb88856359085cc3f81cb9dbd7dfda243c7bfe
+Subproject a46f5876f5c1a5bd7027e92d3aef230127d3c59
diff --git a/world/map/data/021-2.wlk b/world/map/data/021-2.wlk
index 16181c72..e9094465 100644
--- a/world/map/data/021-2.wlk
+++ b/world/map/data/021-2.wlk
Binary files differ
diff --git a/world/map/npc/021-2/_warps.txt b/world/map/npc/021-2/_warps.txt
index 3204033a..754eae30 100644
--- a/world/map/npc/021-2/_warps.txt
+++ b/world/map/npc/021-2/_warps.txt
@@ -12,3 +12,4 @@
021-2.gat,25,67|warp|To Outside|-1,-1,021-1.gat,53,100
021-2.gat,46,97|warp|To First Floor|0,-1,021-2.gat,46,58
021-2.gat,46,57|warp|To Second Floor|0,-1,021-2.gat,46,96
+021-2.gat,70,58|warp|To Main Room|-1,-1,021-2.gat,42,54