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/021-1/hideandseek.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/021-1/hideandseek.txt')
| -rw-r--r-- | world/map/npc/021-1/hideandseek.txt | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/world/map/npc/021-1/hideandseek.txt b/world/map/npc/021-1/hideandseek.txt index 22b0c86b..fb789340 100644 --- a/world/map/npc/021-1/hideandseek.txt +++ b/world/map/npc/021-1/hideandseek.txt @@ -6,7 +6,8 @@ // bit 7: unused // Author: Jenalya --|script|#hideandseekNTconfig|-1,{ +-|script|#hideandseekNTconfig|-1, +{ OnInit: set $@hideandseekNT_MASK, BYTE_0_MASK; set $@hideandseekNT_SHIFT, BYTE_0_SHIFT; @@ -21,8 +22,8 @@ OnInit: end; } -021-1.gat,87,66,0|script|Ayasha|258,{ - +021-1.gat,87,66,0|script|Ayasha|258, +{ set @state, ((QUEST_NorthTulimshar & $@hideandseekNT_MASK) >> $@hideandseekNT_SHIFT); set @EXP, 75; @@ -81,8 +82,8 @@ L_Close: close; } -021-1.gat,63,107,0|script|Latif|262,{ - +021-1.gat,63,107,0|script|Latif|262, +{ set @state, ((QUEST_NorthTulimshar & $@hideandseekNT_MASK) >> $@hideandseekNT_SHIFT); set @EXP, 15; @@ -136,8 +137,8 @@ L_Close: close; } -021-1.gat,123,116,0|script|Charda|260,{ - +021-1.gat,123,116,0|script|Charda|260, +{ set @state, ((QUEST_NorthTulimshar & $@hideandseekNT_MASK) >> $@hideandseekNT_SHIFT); set @EXP, 15; @@ -188,8 +189,8 @@ L_Close: close; } -021-1.gat,78,87,0|script|Faris|259,{ - +021-1.gat,78,87,0|script|Faris|259, +{ set @state, ((QUEST_NorthTulimshar & $@hideandseekNT_MASK) >> $@hideandseekNT_SHIFT); set @EXP, 25; @@ -236,8 +237,8 @@ L_Close: close; } -021-1.gat,98,25,0|script|Rasin|263,{ - +021-1.gat,98,25,0|script|Rasin|263, +{ set @state, ((QUEST_NorthTulimshar & $@hideandseekNT_MASK) >> $@hideandseekNT_SHIFT); set @EXP, 15; @@ -275,8 +276,8 @@ L_Close: close; } -021-1.gat,155,25,0|script|Ghada|265,{ - +021-1.gat,155,25,0|script|Ghada|265, +{ set @state, ((QUEST_NorthTulimshar & $@hideandseekNT_MASK) >> $@hideandseekNT_SHIFT); set @EXP, 15; |