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/018-3/evil-obelisk.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/018-3/evil-obelisk.txt')
| -rw-r--r-- | world/map/npc/018-3/evil-obelisk.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/world/map/npc/018-3/evil-obelisk.txt b/world/map/npc/018-3/evil-obelisk.txt index c80e3b59..aec1345b 100644 --- a/world/map/npc/018-3/evil-obelisk.txt +++ b/world/map/npc/018-3/evil-obelisk.txt @@ -3,8 +3,16 @@ 018-3.gat,67,28,0|script|Evil Obelisk|185,{ callfunc "ClearVariables"; set @map$, "018-3.gat"; - set @x, 67; - set @y, 28; + set @x0, 56; + set @y0, 22; + set @x1, 77; + set @y1, 37; callfunc "EvilObelisk"; +//clearing vars + set @map$, ""; + set @x0, 0; + set @y0, 0; + set @x1, 0; + set @y1, 0; close; } |