diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-12-15 14:44:24 +0100 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-12-15 18:15:13 +0100 |
| commit | 9f2465632de25155aed319a960529004f67af8ed (patch) | |
| tree | 735526085c15c15c5bc41ba3c44d0238ed3f5032 /world/map/npc/xmas/2011/leatherBall.txt | |
| parent | 513e4586087ae2f063f82d885b81833e421c8ca5 (diff) | |
| download | serverdata-9f2465632de25155aed319a960529004f67af8ed.tar.gz serverdata-9f2465632de25155aed319a960529004f67af8ed.tar.bz2 serverdata-9f2465632de25155aed319a960529004f67af8ed.tar.xz serverdata-9f2465632de25155aed319a960529004f67af8ed.zip | |
Christmas Event 2011: fix of checking the characters age, expand reward timev2011.12.17
Diffstat (limited to 'world/map/npc/xmas/2011/leatherBall.txt')
| -rw-r--r-- | world/map/npc/xmas/2011/leatherBall.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/world/map/npc/xmas/2011/leatherBall.txt b/world/map/npc/xmas/2011/leatherBall.txt index f7c007d8..66e3be2b 100644 --- a/world/map/npc/xmas/2011/leatherBall.txt +++ b/world/map/npc/xmas/2011/leatherBall.txt @@ -10,9 +10,11 @@ 030-2.gat,37,81,0|script|Tarmo|328,{ - if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day)) + if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day) + && !(gettime(7) == ($@xmas2011_year + 1) && gettime(6) == 1 && gettime(5) <= $@xmas2011_reward_end_day)) goto L_NoEvent; - if ((gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_reward_start_day)) + if ((gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_reward_start_day) + || (gettime(7) == ($@xmas2011_year + 1) && gettime(6) == 1 && gettime(5) <= $@xmas2011_reward_end_day)) goto L_RewardTime; set @ball, (xmas11 & $@xmas11_BallMask) >> $@xmas11_BallShift; @@ -62,9 +64,11 @@ L_Close: 030-2.gat,154,33,0|script|Iivo|329,{ - if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day)) + if (!(gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_start_day) + && !(gettime(7) == ($@xmas2011_year + 1) && gettime(6) == 1 && gettime(5) <= $@xmas2011_reward_end_day)) goto L_NoEvent; - if ((gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_reward_start_day)) + if ((gettime(7) == $@xmas2011_year && gettime(6) == 12 && gettime(5) >= $@xmas2011_reward_start_day) + || (gettime(7) == ($@xmas2011_year + 1) && gettime(6) == 1 && gettime(5) <= $@xmas2011_reward_end_day)) goto L_RewardTime; set @ball, (xmas11 & $@xmas11_BallMask) >> $@xmas11_BallShift; |