diff options
author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-09 20:38:38 +0200 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-09 20:38:38 +0200 |
commit | 7f4410f9d5dce2884368a4b1d01139abd2e65fd5 (patch) | |
tree | e4f6cd0f6ed40b1852fa5ce28a5d78be982b0a73 /world/map/npc/021-2/_warps.txt | |
parent | 8ac35610a416d3937ccf4b3b74a61622382e8162 (diff) | |
parent | fa2ffc29c1ef2c33ff0a9c1baf7026a4d9ffe0b6 (diff) | |
download | serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.gz serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.bz2 serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.xz serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.zip |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'world/map/npc/021-2/_warps.txt')
-rw-r--r-- | world/map/npc/021-2/_warps.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/world/map/npc/021-2/_warps.txt b/world/map/npc/021-2/_warps.txt index ad18520c..4614f970 100644 --- a/world/map/npc/021-2/_warps.txt +++ b/world/map/npc/021-2/_warps.txt @@ -2,7 +2,6 @@ // North Tulimshar Indoor warps 021-2.gat,27,30|warp|To Outside|-1,-1,021-1.gat,53,135 -021-2.gat,33,30|warp|To Outside|-1,-1,021-1.gat,55,135 021-2.gat,39,30|warp|To Outside|-1,-1,021-1.gat,57,135 021-2.gat,91,28|warp|To Outside|-1,-1,021-1.gat,103,101 021-2.gat,122,24|warp|To Roof|-1,-1,021-1.gat,103,97 @@ -13,4 +12,12 @@ 021-2.gat,46,97|warp|To First Floor|0,-1,021-2.gat,46,58 021-2.gat,46,57|warp|To Second Floor|0,-1,021-2.gat,46,96 021-2.gat,70,58|warp|To Main Room|-1,-1,021-2.gat,42,54 -021-2.gat,28,130|warp|to Outside|-1,-1,021-1.gat,43,111 +021-2.gat,28,130|warp|To Outside|-1,-1,021-1.gat,43,111 +021-2.gat,28,130|warp|To Outside|-1,-1,021-1.gat,43,111 +021-2.gat,84,93|warp|To First Floor|-1,0,021-2.gat,80,125 +021-2.gat,84,123|warp|To Second Floor|-1,0,021-2.gat,81,95 +021-2.gat,79,139|warp|To Outside|-1,-1,021-1.gat,132,32 +021-2.gat,72,139|warp|To Outside|-1,-1,021-1.gat,125,32 +021-2.gat,124,69|warp|To Outside|-1,-1,021-1.gat,125,28 +021-2.gat,75,93|warp|To Outside|-1,-1,021-1.gat,133,25 +021-2.gat,33,30|warp|To Outside|-1,-1,021-1.gat,55,135 |