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/034-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/034-1/_warps.txt')
| -rw-r--r-- | world/map/npc/034-1/_warps.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/world/map/npc/034-1/_warps.txt b/world/map/npc/034-1/_warps.txt index 9c0acf36..be29b7b1 100644 --- a/world/map/npc/034-1/_warps.txt +++ b/world/map/npc/034-1/_warps.txt @@ -5,3 +5,5 @@ 034-1.gat,16,103|warp|To Deep Snow Forest|-1,1,045-1.gat,176,133 034-1.gat,15,31|warp|To Deep Snow Forest|-1,0,045-1.gat,174,59 034-1.gat,95,18|warp|ToHighlands1|0,-1,046-1.gat,95,116 +034-1.gat,31,68|warp|To Trapper|-1,-1,034-2.gat,28,31 +034-1.gat,64,99|warp|To Cabin|-1,-1,034-2.gat,73,29 |