diff options
Diffstat (limited to 'world/map/npc/xmas/2011/doll.txt')
| -rw-r--r-- | world/map/npc/xmas/2011/doll.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/world/map/npc/xmas/2011/doll.txt b/world/map/npc/xmas/2011/doll.txt index 2fd4145a..7c1ca6c6 100644 --- a/world/map/npc/xmas/2011/doll.txt +++ b/world/map/npc/xmas/2011/doll.txt @@ -10,9 +10,11 @@ 030-2.gat,37,85,0|script|Taito|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 @doll, (xmas11 & $@xmas11_DollMask) >> $@xmas11_DollShift; @@ -58,9 +60,11 @@ L_Close: 030-2.gat,153,39,0|script|Raimo|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 @doll, (xmas11 & $@xmas11_DollMask) >> $@xmas11_DollShift; |