diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
| commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
| tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/002-1/_warps.txt | |
| parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
| parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
| download | serverdata-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/002-1/_warps.txt')
| -rw-r--r-- | world/map/npc/002-1/_warps.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/world/map/npc/002-1/_warps.txt b/world/map/npc/002-1/_warps.txt index e238d32f..b86304b9 100644 --- a/world/map/npc/002-1/_warps.txt +++ b/world/map/npc/002-1/_warps.txt @@ -2,6 +2,9 @@ // Sandstorm Desert warps 002-1.gat,58,13|warp|To South Tulimshar|3,-1,001-1.gat,44,86 -002-1.gat,108,79|warp|To Snake Desert|-1,1,005-1.gat,20,40 002-1.gat,12,67|warp|To Beach|-1,3,003-1.gat,171,76 002-1.gat,28,13|warp|To Beach|1,-1,004-1.gat,84,114 +002-1.gat,79,99|warp|To Desert Mine Camp|-1,-1,002-3.gat,85,49 +002-1.gat,20,94|warp|To Desert Mine Camp|-1,-1,002-3.gat,51,33 +002-1.gat,104,92|warp|To Mystics House|-1,-1,002-2.gat,28,29 +002-1.gat,108,79|warp|To Snake Desert|-1,1,005-1.gat,20,40 |