summaryrefslogtreecommitdiff
path: root/world/map/npc/055-1/_warps.txt
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-07-07 12:51:32 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2013-07-07 12:51:32 +0200
commit0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch)
tree4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/055-1/_warps.txt
parenta89882b69d9f12499404ca9d471d5a735bc63988 (diff)
parent135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff)
downloadserverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz
serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip
Merge remote-tracking branch 'origin/master' into waric
Conflicts: world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/055-1/_warps.txt')
-rw-r--r--world/map/npc/055-1/_warps.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/world/map/npc/055-1/_warps.txt b/world/map/npc/055-1/_warps.txt
index e9d4d2af..be1df9d0 100644
--- a/world/map/npc/055-1/_warps.txt
+++ b/world/map/npc/055-1/_warps.txt
@@ -1,8 +1,8 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Woodland Hills warps
-055-1.gat,100,82|warp|To Cave|-1,-1,055-3.gat,30,27
-055-1.gat,100,89|warp|To Cave|-1,-1,055-3.gat,50,41
+055-1.gat,100,83|warp|To Cave|-1,-1,055-3.gat,30,27
+055-1.gat,100,89|warp|To Cave|-1,-1,055-3.gat,50,42
055-1.gat,22,52|warp|To Woodland Hills|-1,2,013-1.gat,135,51
055-1.gat,137,96|warp|To Cave|-1,-1,055-3.gat,76,39
055-1.gat,60,93|warp|To Cave|-1,-1,055-3.gat,96,70