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/badguy.txt | |
| parent | 513e4586087ae2f063f82d885b81833e421c8ca5 (diff) | |
| download | classic-serverdata-9f2465632de25155aed319a960529004f67af8ed.tar.gz classic-serverdata-9f2465632de25155aed319a960529004f67af8ed.tar.bz2 classic-serverdata-9f2465632de25155aed319a960529004f67af8ed.tar.xz classic-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/badguy.txt')
| -rw-r--r-- | world/map/npc/xmas/2011/badguy.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/world/map/npc/xmas/2011/badguy.txt b/world/map/npc/xmas/2011/badguy.txt index 8b25fdfb..3827e043 100644 --- a/world/map/npc/xmas/2011/badguy.txt +++ b/world/map/npc/xmas/2011/badguy.txt @@ -5,11 +5,13 @@ 030-2.gat,100,31,0|script|Balthasar|336,{ - 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; - if ((BaseLevel < 30) && (gettimetick(2)-TUT_var < 3*7*86400)) // player must be created at least three weeks ago + if ((BaseLevel < 30) || (gettimetick(2)-TUT_var < 3*7*86400)) // player must be created at least three weeks ago goto L_NoHelp; set @plushmouboo, (xmas11 & $@xmas11_PlushMoubooMask) >> $@xmas11_PlushMoubooShift; |