summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-10-13 16:57:32 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2011-10-13 16:57:32 +0200
commit016ef20149258e14de3c92b1f585e34dede78834 (patch)
treed370cad4d85685aa0fb00055a952b7b95361db0b
parentc4a592e349be24eb8d996fff4f89773d479d24e5 (diff)
downloadserverdata-016ef20149258e14de3c92b1f585e34dede78834.tar.gz
serverdata-016ef20149258e14de3c92b1f585e34dede78834.tar.bz2
serverdata-016ef20149258e14de3c92b1f585e34dede78834.tar.xz
serverdata-016ef20149258e14de3c92b1f585e34dede78834.zip
Client-data: several map fixes.
Mainly layer issues, some collision and warps. Converter ran. Submodule-Pointer updated.
m---------client-data0
-rw-r--r--world/map/data/009-3.wlkbin30204 -> 30204 bytes
-rw-r--r--world/map/data/025-3.wlkbin36104 -> 36104 bytes
-rw-r--r--world/map/npc/013-3/_warps.txt4
-rw-r--r--world/map/npc/017-1/_warps.txt4
-rw-r--r--world/map/npc/017-9/_warps.txt2
6 files changed, 5 insertions, 5 deletions
diff --git a/client-data b/client-data
-Subproject d7ac65725b293329654d17077cde14ed37614b4
+Subproject 7d52874ba66548c5f3f01519ded21e6c5de47be
diff --git a/world/map/data/009-3.wlk b/world/map/data/009-3.wlk
index 816a4ba0..c5299b5d 100644
--- a/world/map/data/009-3.wlk
+++ b/world/map/data/009-3.wlk
Binary files differ
diff --git a/world/map/data/025-3.wlk b/world/map/data/025-3.wlk
index be672592..033d174a 100644
--- a/world/map/data/025-3.wlk
+++ b/world/map/data/025-3.wlk
Binary files differ
diff --git a/world/map/npc/013-3/_warps.txt b/world/map/npc/013-3/_warps.txt
index f4fdc860..8448133a 100644
--- a/world/map/npc/013-3/_warps.txt
+++ b/world/map/npc/013-3/_warps.txt
@@ -28,8 +28,8 @@
013-3.gat,62,100|warp|To Northern Mine|-1,-1,018-3.gat,174,86
013-3.gat,68,97|warp|To Northern Mine|-1,-1,018-3.gat,102,70
013-3.gat,160,103|warp|To Hurnscald Cave|-1,-1,009-3.gat,117,20
-013-3.gat,141,146|warp|To Woodland Hills|-1,-1,017-1.gat,75,32
-013-3.gat,173,131|warp|To Theater Hill|-1,-1,017-1.gat,97,21
+013-3.gat,141,146|warp|To Woodland Hills|-1,-1,017-1.gat,76,33
+013-3.gat,173,131|warp|To Theater Hill|-1,-1,017-1.gat,98,22
013-3.gat,162,169|warp|To Woodland Hills Labyrinth|-1,-1,017-1.gat,98,30
013-3.gat,153,126|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,119,147
013-3.gat,119,148|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,153,127
diff --git a/world/map/npc/017-1/_warps.txt b/world/map/npc/017-1/_warps.txt
index 665718e0..29db314c 100644
--- a/world/map/npc/017-1/_warps.txt
+++ b/world/map/npc/017-1/_warps.txt
@@ -3,6 +3,6 @@
017-1.gat,46,105|warp|To Woodland Hills|2,-1,013-1.gat,45,21
017-1.gat,43,32|warp|To Theater|-1,-1,017-2.gat,26,30
-017-1.gat,76,31|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,140,147
-017-1.gat,98,20|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,172,132
+017-1.gat,76,31|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,141,148
+017-1.gat,98,20|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,173,133
017-1.gat,97,31|warp|To Woodland Hills Labyrinth|-1,-1,013-3.gat,163,168
diff --git a/world/map/npc/017-9/_warps.txt b/world/map/npc/017-9/_warps.txt
index fe1d81d4..57d73676 100644
--- a/world/map/npc/017-9/_warps.txt
+++ b/world/map/npc/017-9/_warps.txt
@@ -2,7 +2,7 @@
// Backstage warps
017-9.gat,22,20|warp|To Left Door Onstage|-1,-1,017-2.gat,23,21
-017-9.gat,26,21|warp|To Outside|-1,-1,017-1.gat,44,33
+017-9.gat,26,21|warp|To Outside|-1,-1,017-1.gat,43,34
017-9.gat,30,20|warp|To Right Door Onstage|-1,-1,017-2.gat,29,21
017-9.gat,21,28|warp|To Left Trapdoor Onstage|-1,-1,017-2.gat,25,25
017-9.gat,26,28|warp|To Centre Trapdoor Onstage|-1,-1,017-2.gat,26,23