diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-04 11:50:48 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-04 11:50:48 +0200 |
| commit | b806463b610dca0b33599f04c90cbef8f9476f81 (patch) | |
| tree | 5f6df917413977c8429fed97573f37b18bb61b74 | |
| parent | 0ead7b5e41f73ef4f572c2b042b2a1e96c9b89ee (diff) | |
| download | serverdata-b806463b610dca0b33599f04c90cbef8f9476f81.tar.gz serverdata-b806463b610dca0b33599f04c90cbef8f9476f81.tar.bz2 serverdata-b806463b610dca0b33599f04c90cbef8f9476f81.tar.xz serverdata-b806463b610dca0b33599f04c90cbef8f9476f81.zip | |
Client-data: some warps and collisions fixed, updated submodule pointer
| m--------- | client-data | 0 | ||||
| -rw-r--r-- | world/map/data/010-1.wlk | bin | 18004 -> 18004 bytes | |||
| -rw-r--r-- | world/map/data/011-1.wlk | bin | 19100 -> 19100 bytes | |||
| -rw-r--r-- | world/map/npc/008-1/_warps.txt | 8 | ||||
| -rw-r--r-- | world/map/npc/009-1/_warps.txt | 4 | ||||
| -rw-r--r-- | world/map/npc/011-1/_warps.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/011-3/_warps.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/011-4/_warps.txt | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/client-data b/client-data -Subproject 91d1bb5a5c036dce9c16432ceedacbf9436141d +Subproject 92f3bac1369d7001513e8772c68e771f585bbef diff --git a/world/map/data/010-1.wlk b/world/map/data/010-1.wlk Binary files differindex 8ae55525..5342c508 100644 --- a/world/map/data/010-1.wlk +++ b/world/map/data/010-1.wlk diff --git a/world/map/data/011-1.wlk b/world/map/data/011-1.wlk Binary files differindex 2fa117b4..e7c8967b 100644 --- a/world/map/data/011-1.wlk +++ b/world/map/data/011-1.wlk diff --git a/world/map/npc/008-1/_warps.txt b/world/map/npc/008-1/_warps.txt index 7b71a640..3210f6be 100644 --- a/world/map/npc/008-1/_warps.txt +++ b/world/map/npc/008-1/_warps.txt @@ -1,11 +1,11 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Hurnscald outskirts warps -008-1.gat,54,61|warp|HurnscaldWestGate|-1,1,009-1.gat,26,36 +008-1.gat,54,61|warp|HurnscaldWestGate|-1,1,009-1.gat,25,36 008-1.gat,79,80|warp|HurnscaldSouthGate|2,-1,009-1.gat,48,54 -008-1.gat,127,61|warp|HurnscaldEastGate|-1,0,009-1.gat,96,35 -008-1.gat,79,49|warp|HurnscaldNorthGate|2,-1,009-1.gat,48,24 -008-1.gat,24,62|warp|ToWoodland|-1,2,011-1.gat,122,61 +008-1.gat,127,61|warp|HurnscaldEastGate|-1,0,009-1.gat,96,36 +008-1.gat,79,49|warp|HurnscaldNorthGate|2,-1,009-1.gat,48,25 +008-1.gat,24,62|warp|ToWoodland|-1,2,011-1.gat,123,61 008-1.gat,79,17|warp|ToWoodlandMines|2,-1,018-1.gat,79,97 008-1.gat,79,102|warp|ToWoodland|2,-1,007-1.gat,68,23 008-1.gat,132,101|warp|ToWoodland|1,-1,007-1.gat,122,23 diff --git a/world/map/npc/009-1/_warps.txt b/world/map/npc/009-1/_warps.txt index 13e86d8f..611ccb17 100644 --- a/world/map/npc/009-1/_warps.txt +++ b/world/map/npc/009-1/_warps.txt @@ -1,8 +1,8 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Hurnscald warps -009-1.gat,49,55|warp|HurnscaldSouthGate|2,-1,008-1.gat,78,82 -009-1.gat,97,36|warp|HurnscaldEastGate|-1,0,008-1.gat,129,60 +009-1.gat,49,55|warp|HurnscaldSouthGate|2,-1,008-1.gat,78,81 +009-1.gat,97,36|warp|HurnscaldEastGate|-1,0,008-1.gat,128,61 009-1.gat,35,30|warp|ToInn|-1,-1,009-2.gat,50,55 009-1.gat,58,46|warp|ToGeneralStore|-1,-1,009-2.gat,27,105 009-1.gat,59,33|warp|ToArcherShop|-1,-1,009-2.gat,95,29 diff --git a/world/map/npc/011-1/_warps.txt b/world/map/npc/011-1/_warps.txt index 960f8950..bc67cb3f 100644 --- a/world/map/npc/011-1/_warps.txt +++ b/world/map/npc/011-1/_warps.txt @@ -4,6 +4,6 @@ 011-1.gat,58,92|warp|ToCave|-1,-1,011-3.gat,15,15 011-1.gat,30,61|warp|ToWoodland|-1,1,014-1.gat,106,91 011-1.gat,49,104|warp|ToWoodland|0,-1,010-1.gat,48,24 -011-1.gat,125,62|warp|ToWoodland|-1,2,008-1.gat,27,61 +011-1.gat,124,62|warp|ToWoodland|-1,2,008-1.gat,25,61 011-1.gat,73,11|warp|ToWoodlandHills|0,-1,012-1.gat,131,162 011-1.gat,38,36|warp|affenpeter|-1,-1,011-6.gat,49,99 diff --git a/world/map/npc/011-3/_warps.txt b/world/map/npc/011-3/_warps.txt index 69cc183d..0bc3aed1 100644 --- a/world/map/npc/011-3/_warps.txt +++ b/world/map/npc/011-3/_warps.txt @@ -1,4 +1,4 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Hermit's cave warps -011-3.gat,31,14|warp|ToLakeCave|-1,-1,011-4.gat,72,11 +011-3.gat,31,14|warp|ToLakeCave|-1,-1,011-4.gat,72,9 diff --git a/world/map/npc/011-4/_warps.txt b/world/map/npc/011-4/_warps.txt index 6ebe9c8b..f23c7368 100644 --- a/world/map/npc/011-4/_warps.txt +++ b/world/map/npc/011-4/_warps.txt @@ -1,7 +1,7 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. // Lake cave warps -011-4.gat,73,8|warp|ToHermitsCave|0,-1,011-3.gat,31,24 +011-4.gat,73,8|warp|ToHermitsCave|0,-1,011-3.gat,31,15 011-4.gat,129,86|warp|ToCaveBeneathHurnscald|-1,-1,009-3.gat,21,55 011-4.gat,39,35|warp|warp|-1,-1,011-6.gat,47,183 011-4.gat,16,57|warp|warp|-1,-1,011-6.gat,24,204 |