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-1/_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-1/_warps.txt')
| -rw-r--r-- | world/map/npc/021-1/_warps.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/world/map/npc/021-1/_warps.txt b/world/map/npc/021-1/_warps.txt index 5d620e74..618c057a 100644 --- a/world/map/npc/021-1/_warps.txt +++ b/world/map/npc/021-1/_warps.txt @@ -7,10 +7,14 @@ 021-1.gat,55,134|warp|To Government Building|-1,-1,021-2.gat,33,29 021-1.gat,57,134|warp|To Government Building|-1,-1,021-2.gat,39,29 021-1.gat,103,100|warp|To Tulimshar Bakery|-1,-1,021-2.gat,91,27 -021-1.gat,103,96|warp|toBakery|-1,-1,021-2.gat,122,23 +021-1.gat,103,96|warp|To Bakery|-1,-1,021-2.gat,122,23 021-1.gat,49,64|warp|To Tulimshar Canyon|3,-1,024-1.gat,86,73 -021-1.gat,53,99|warp|To Tulimshar Forge|-1,-1,021-2.gat,25,66 -021-1.gat,52,95|warp|To Tulimshar Forge|-1,-1,021-2.gat,23,98 +021-1.gat,53,99|warp|To Wizard's Rest|-1,-1,021-2.gat,25,66 +021-1.gat,52,95|warp|To Wizard's Rest|-1,-1,021-2.gat,23,98 021-1.gat,73,22|warp|To Tulimshar Port|3,-1,022-1.gat,73,109 021-1.gat,113,22|warp|To Tulimshar Port|3,-1,022-1.gat,113,109 -021-1.gat,43,110|warp|to Store|-1,-1,021-2.gat,28,129 +021-1.gat,43,110|warp|To Store|-1,-1,021-2.gat,28,129 +021-1.gat,132,31|warp|To Tulimshar Forge|-1,-1,021-2.gat,79,138 +021-1.gat,133,24|warp|To Tulimshar Forge|-1,-1,021-2.gat,75,92 +021-1.gat,125,27|warp|To Tulimshar Forge|-1,-1,021-2.gat,124,68 +021-1.gat,125,31|warp|To Tulimshar Forge|-1,-1,021-2.gat,72,138 |