summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-09-25 11:23:20 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2011-09-25 11:23:20 +0200
commit9ebe97f14fbff7bf0496e2a1a63ca30cd0965d68 (patch)
treec5b17c9ca362d9f6b7fba51f6d08b309b142d49b
parent3fb06d128e1a3ff04d193445985f7969ff92a788 (diff)
downloadserverdata-9ebe97f14fbff7bf0496e2a1a63ca30cd0965d68.tar.gz
serverdata-9ebe97f14fbff7bf0496e2a1a63ca30cd0965d68.tar.bz2
serverdata-9ebe97f14fbff7bf0496e2a1a63ca30cd0965d68.tar.xz
serverdata-9ebe97f14fbff7bf0496e2a1a63ca30cd0965d68.zip
Warp between 006-1 and 032-3 fixed, missing collision tile was added.
Converter ran. Submodule pointer updated.
m---------client-data0
-rw-r--r--world/map/data/032-3.wlkbin16004 -> 16004 bytes
-rw-r--r--world/map/npc/006-1/_warps.txt2
-rw-r--r--world/map/npc/032-3/_warps.txt2
4 files changed, 2 insertions, 2 deletions
diff --git a/client-data b/client-data
-Subproject 244bae0726b111d8951b64bf695305d627de0df
+Subproject be28cc4642abe5139bd3cf58a4d7e49dd2020af
diff --git a/world/map/data/032-3.wlk b/world/map/data/032-3.wlk
index 235ddaa1..8ee20b59 100644
--- a/world/map/data/032-3.wlk
+++ b/world/map/data/032-3.wlk
Binary files differ
diff --git a/world/map/npc/006-1/_warps.txt b/world/map/npc/006-1/_warps.txt
index a5af3729..add0e4b2 100644
--- a/world/map/npc/006-1/_warps.txt
+++ b/world/map/npc/006-1/_warps.txt
@@ -21,7 +21,7 @@
006-1.gat,38,121|warp|To Desert Mountains Cave|-1,-1,006-3.gat,38,123
006-1.gat,74,90|warp|To Desert Mountains Cave|-1,-1,006-3.gat,74,92
006-1.gat,51,90|warp|To Desert Mountains Cave|-1,-1,006-3.gat,51,92
-006-1.gat,30,123|warp|To Outback Cave|-1,-1,032-3.gat,128,32
+006-1.gat,30,123|warp|To Outback Cave|-1,-1,032-3.gat,128,33
006-1.gat,19,30|warp|To Snake Desert|-1,-1,005-1.gat,172,101
006-1.gat,20,29|warp|To Snake Desert|-1,-1,005-1.gat,172,101
006-1.gat,21,28|warp|To Snake Desert|-1,-1,005-1.gat,172,101
diff --git a/world/map/npc/032-3/_warps.txt b/world/map/npc/032-3/_warps.txt
index 7d7964c2..b84c4e2c 100644
--- a/world/map/npc/032-3/_warps.txt
+++ b/world/map/npc/032-3/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Outback Cave warps
-032-3.gat,128,33|warp|To Desert Mountains|-1,-1,006-1.gat,30,124
+032-3.gat,128,34|warp|To Desert Mountains|-1,-1,006-1.gat,30,124
032-3.gat,56,61|warp|To Outback|-1,-1,032-1.gat,64,53