summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-10-30 10:22:29 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2011-10-30 10:28:32 +0100
commitdbfd43762f5ac4c21149d02a6e70bab53c4ecc5a (patch)
tree75e102a67028b7f83d7e4bc1d7b32d315ca60892
parent353f73685e3c52c3fc19ad04b468ae2bcbe41264 (diff)
downloadserverdata-dbfd43762f5ac4c21149d02a6e70bab53c4ecc5a.tar.gz
serverdata-dbfd43762f5ac4c21149d02a6e70bab53c4ecc5a.tar.bz2
serverdata-dbfd43762f5ac4c21149d02a6e70bab53c4ecc5a.tar.xz
serverdata-dbfd43762f5ac4c21149d02a6e70bab53c4ecc5a.zip
Client-data:
Some maps fixes including collision layer and warps. Fix about snow cave tileset. Adding graphic about four-leaf clover. Converter ran and submodule pointer updated.
m---------client-data0
-rw-r--r--world/map/data/010-2.wlkbin11774 -> 11774 bytes
-rw-r--r--world/map/data/018-1.wlkbin24004 -> 24004 bytes
-rw-r--r--world/map/data/018-2.wlkbin10224 -> 10224 bytes
-rw-r--r--world/map/npc/018-1/_warps.txt2
-rw-r--r--world/map/npc/018-2/_warps.txt2
6 files changed, 2 insertions, 2 deletions
diff --git a/client-data b/client-data
-Subproject c79069b8b4c695d63c15f14c24b3afbbcce16b9
+Subproject 9c262d994799dedb5d0435f7af9ecdbe969063b
diff --git a/world/map/data/010-2.wlk b/world/map/data/010-2.wlk
index 3808ec6b..a4467666 100644
--- a/world/map/data/010-2.wlk
+++ b/world/map/data/010-2.wlk
Binary files differ
diff --git a/world/map/data/018-1.wlk b/world/map/data/018-1.wlk
index c85d2c10..2b491046 100644
--- a/world/map/data/018-1.wlk
+++ b/world/map/data/018-1.wlk
Binary files differ
diff --git a/world/map/data/018-2.wlk b/world/map/data/018-2.wlk
index cb6f5746..25220762 100644
--- a/world/map/data/018-2.wlk
+++ b/world/map/data/018-2.wlk
Binary files differ
diff --git a/world/map/npc/018-1/_warps.txt b/world/map/npc/018-1/_warps.txt
index 4e9f356a..c6de8d75 100644
--- a/world/map/npc/018-1/_warps.txt
+++ b/world/map/npc/018-1/_warps.txt
@@ -16,4 +16,4 @@
018-1.gat,177,20|warp|To Jack O Cave|-1,-1,013-3.gat,177,90
018-1.gat,65,73|warp|Woodland Mining Camp Indoor|-1,-1,018-2.gat,50,28
018-1.gat,79,98|warp|To Hurnscald Outskirts|2,-1,008-1.gat,78,18
-018-1.gat,64,69|warp|Woodland Mining Camp Indoor|-1,-1,018-2.gat,41,21
+018-1.gat,64,70|warp|Woodland Mining Camp Indoor|-1,-1,018-2.gat,41,21
diff --git a/world/map/npc/018-2/_warps.txt b/world/map/npc/018-2/_warps.txt
index 92b48a56..ca99f0a6 100644
--- a/world/map/npc/018-2/_warps.txt
+++ b/world/map/npc/018-2/_warps.txt
@@ -2,7 +2,7 @@
// Woodland Mining Camp Indoor warps
018-2.gat,50,29|warp|To Outside|-1,-1,018-1.gat,65,74
-018-2.gat,41,20|warp|To Outside|-1,-1,018-1.gat,64,68
+018-2.gat,41,20|warp|To Outside|-1,-1,018-1.gat,64,69
018-2.gat,20,24|warp|To Bottom Floor|-1,-1,018-2.gat,112,26
018-2.gat,112,25|warp|To First Floor|-1,-1,018-2.gat,20,23
018-2.gat,21,28|warp|To Second Floor|0,-1,018-2.gat,79,25