summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-12-30 21:22:23 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2011-12-31 01:56:56 +0100
commit1dce33d8da622cd66a60803123ac44a70bfeed7e (patch)
tree4d2c6bb2058ec1404ddd0ed396e3d9fe8bd84794
parent0166b0d4b2f17be66402c599574f76ae486adda8 (diff)
downloadserverdata-1dce33d8da622cd66a60803123ac44a70bfeed7e.tar.gz
serverdata-1dce33d8da622cd66a60803123ac44a70bfeed7e.tar.bz2
serverdata-1dce33d8da622cd66a60803123ac44a70bfeed7e.tar.xz
serverdata-1dce33d8da622cd66a60803123ac44a70bfeed7e.zip
Adding warp between 034-1 and 045-1. Submodule pointer updated.
m---------client-data0
-rw-r--r--world/map/data/034-1.wlkbin22788 -> 22788 bytes
-rw-r--r--world/map/data/045-1.wlkbin40004 -> 40004 bytes
-rw-r--r--world/map/npc/034-1/_warps.txt2
-rw-r--r--world/map/npc/045-1/_warps.txt2
5 files changed, 4 insertions, 0 deletions
diff --git a/client-data b/client-data
-Subproject 17406201bca054663a44728d365d18203cc79d8
+Subproject e653f12b7a9be1adccee80fffc727b6a77ef839
diff --git a/world/map/data/034-1.wlk b/world/map/data/034-1.wlk
index 28a1bea4..4388910c 100644
--- a/world/map/data/034-1.wlk
+++ b/world/map/data/034-1.wlk
Binary files differ
diff --git a/world/map/data/045-1.wlk b/world/map/data/045-1.wlk
index f48c4ee3..577019fe 100644
--- a/world/map/data/045-1.wlk
+++ b/world/map/data/045-1.wlk
Binary files differ
diff --git a/world/map/npc/034-1/_warps.txt b/world/map/npc/034-1/_warps.txt
index 69d8b198..2adb0abf 100644
--- a/world/map/npc/034-1/_warps.txt
+++ b/world/map/npc/034-1/_warps.txt
@@ -2,3 +2,5 @@
// Snow Forest warps
034-1.gat,160,20|warp|To Snow Field|-1,0,033-1.gat,23,19
+034-1.gat,16,103|warp|To Deep Snow Forest|-1,1,045-1.gat,176,133
+034-1.gat,15,31|warp|To Deep Snow Forest|-1,0,045-1.gat,174,59
diff --git a/world/map/npc/045-1/_warps.txt b/world/map/npc/045-1/_warps.txt
index a636f7b7..4fe703c1 100644
--- a/world/map/npc/045-1/_warps.txt
+++ b/world/map/npc/045-1/_warps.txt
@@ -1,3 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Deep Snow Forest warps
+045-1.gat,175,60|warp|To Snow Forest|-1,0,034-1.gat,16,30
+045-1.gat,177,132|warp|To Snow Forest|-1,1,034-1.gat,17,102