summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-09-12 20:38:36 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2011-09-12 21:24:10 +0200
commit75e90d23f819283087c7ca0d4ecaaa1d807135a2 (patch)
treeef20e2ee251b28b8c7daca23aeee073b0b17a0d3
parentf8390983dff36095e80bb7b1317ca00afc145232 (diff)
downloadserverdata-75e90d23f819283087c7ca0d4ecaaa1d807135a2.tar.gz
serverdata-75e90d23f819283087c7ca0d4ecaaa1d807135a2.tar.bz2
serverdata-75e90d23f819283087c7ca0d4ecaaa1d807135a2.tar.xz
serverdata-75e90d23f819283087c7ca0d4ecaaa1d807135a2.zip
Adding new maps/map parts in snow area.
In 020 new building with indoor. In 031 indoor of seamans house added. Also collision removed for small chairs. Submodule pointer updated.
m---------client-data0
-rw-r--r--world/map/data/020-1.wlkbin18948 -> 18948 bytes
-rw-r--r--world/map/data/020-2.wlkbin16004 -> 16004 bytes
-rw-r--r--world/map/data/031-1.wlkbin18948 -> 18948 bytes
-rw-r--r--world/map/data/031-2.wlkbin2504 -> 5004 bytes
-rw-r--r--world/map/npc/020-1/_warps.txt1
-rw-r--r--world/map/npc/020-2/_warps.txt1
-rw-r--r--world/map/npc/031-1/_warps.txt1
-rw-r--r--world/map/npc/031-2/_warps.txt1
9 files changed, 4 insertions, 0 deletions
diff --git a/client-data b/client-data
-Subproject 9f6654c183f87a650a247633382bdbd2b0e4925
+Subproject 30f82fd029f4ef6007625b7cf0d4ce58c3e4de0
diff --git a/world/map/data/020-1.wlk b/world/map/data/020-1.wlk
index 05549a3f..5dfb5160 100644
--- a/world/map/data/020-1.wlk
+++ b/world/map/data/020-1.wlk
Binary files differ
diff --git a/world/map/data/020-2.wlk b/world/map/data/020-2.wlk
index bc938c2d..5d7706d8 100644
--- a/world/map/data/020-2.wlk
+++ b/world/map/data/020-2.wlk
Binary files differ
diff --git a/world/map/data/031-1.wlk b/world/map/data/031-1.wlk
index 4341935a..c914af1f 100644
--- a/world/map/data/031-1.wlk
+++ b/world/map/data/031-1.wlk
Binary files differ
diff --git a/world/map/data/031-2.wlk b/world/map/data/031-2.wlk
index 53043ac9..b73c97d6 100644
--- a/world/map/data/031-2.wlk
+++ b/world/map/data/031-2.wlk
Binary files differ
diff --git a/world/map/npc/020-1/_warps.txt b/world/map/npc/020-1/_warps.txt
index b63439ea..4898a5d5 100644
--- a/world/map/npc/020-1/_warps.txt
+++ b/world/map/npc/020-1/_warps.txt
@@ -9,3 +9,4 @@
020-1.gat,57,91|warp|To Nivalis Shop|-1,-1,020-2.gat,65,23
020-1.gat,70,128|warp|To Snow Field|2,-1,019-1.gat,70,22
020-1.gat,107,55|warp|To Nivalis Port|-1,-1,031-1.gat,38,55
+020-1.gat,59,45|warp|To Nivalis Storage|-1,-1,020-2.gat,127,68
diff --git a/world/map/npc/020-2/_warps.txt b/world/map/npc/020-2/_warps.txt
index e5c61ebb..0007c8ee 100644
--- a/world/map/npc/020-2/_warps.txt
+++ b/world/map/npc/020-2/_warps.txt
@@ -6,3 +6,4 @@
020-2.gat,111,33|warp|To Outside|-1,-1,020-1.gat,64,83
020-2.gat,32,74|warp|To Outside|-1,-1,020-1.gat,80,47
020-2.gat,72,71|warp|To Outside|-1,-1,020-1.gat,66,53
+020-2.gat,127,69|warp|To Outside|-1,-1,020-1.gat,59,46
diff --git a/world/map/npc/031-1/_warps.txt b/world/map/npc/031-1/_warps.txt
index 8becf0e4..1a5106da 100644
--- a/world/map/npc/031-1/_warps.txt
+++ b/world/map/npc/031-1/_warps.txt
@@ -3,3 +3,4 @@
031-1.gat,37,55|warp|To Nivalis|-1,-1,020-1.gat,106,55
031-1.gat,76,24|warp|To Ice Labyrinth|-1,-1,031-3.gat,212,299
+031-1.gat,90,115|warp|To Nivalis Storage|-1,-1,031-2.gat,73,29
diff --git a/world/map/npc/031-2/_warps.txt b/world/map/npc/031-2/_warps.txt
index 88ff0d61..5e366a1d 100644
--- a/world/map/npc/031-2/_warps.txt
+++ b/world/map/npc/031-2/_warps.txt
@@ -2,3 +2,4 @@
// Angela's House warps
031-2.gat,23,30|warp|To Outside|-1,-1,031-1.gat,95,81
+031-2.gat,73,30|warp|To Outside|-1,-1,031-1.gat,90,116