diff options
author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/020-1/well.txt | |
parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
download | serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/020-1/well.txt')
-rw-r--r-- | world/map/npc/020-1/well.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/world/map/npc/020-1/well.txt b/world/map/npc/020-1/well.txt index 265ce212..17b63c5c 100644 --- a/world/map/npc/020-1/well.txt +++ b/world/map/npc/020-1/well.txt @@ -14,8 +14,8 @@ //# used variables: QUEST_Nivalis_state Nibble4 //############################################ -020-1.gat,99,83,0|script|#Well|400,{ - +020-1.gat,99,83,0|script|#Well|400, +{ set @Q_MASK, NIBBLE_4_MASK; set @Q_SHIFT, NIBBLE_4_SHIFT; set @Q_status, ((QUEST_Nivalis_state) & @Q_MASK) >> @Q_SHIFT; @@ -97,7 +97,8 @@ S_Update_Var: return; } -020-2.gat,100,28,0|script|Miler|100,{ +020-2.gat,100,28,0|script|Miler|100, +{ set @Q_MASK, NIBBLE_4_MASK; set @Q_SHIFT, NIBBLE_4_SHIFT; set @Q_status, ((QUEST_Nivalis_state) & @Q_MASK) >> @Q_SHIFT; |