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/020-1 | |
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/020-1')
-rw-r--r-- | world/map/npc/020-1/soul-menhir.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/world/map/npc/020-1/soul-menhir.txt b/world/map/npc/020-1/soul-menhir.txt index 68a81acc..cdcc05c1 100644 --- a/world/map/npc/020-1/soul-menhir.txt +++ b/world/map/npc/020-1/soul-menhir.txt @@ -3,8 +3,8 @@ 020-1.gat,63,89,0|script|Soul Menhir|346,{ callfunc "ClearVariables"; set @map$, "020-1.gat"; - setarray @Xs, 62, 63, 64, 62, 64, 62, 63, 64; - setarray @Ys, 88, 88, 88, 89, 89, 90, 90, 90; + setarray @Xs, 62, 63, 64, 62, 64, 62, 64; + setarray @Ys, 88, 88, 88, 89, 89, 90, 90; set @x, 0; set @y, 0; callfunc "SoulMenhir"; |