diff options
Diffstat (limited to 'world/map/npc/annuals/xmas/config.txt')
| -rw-r--r-- | world/map/npc/annuals/xmas/config.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/world/map/npc/annuals/xmas/config.txt b/world/map/npc/annuals/xmas/config.txt index caf4ad77..4eacec58 100644 --- a/world/map/npc/annuals/xmas/config.txt +++ b/world/map/npc/annuals/xmas/config.txt @@ -268,10 +268,15 @@ L_Main: if($@xmas_debug == $@xmas_reward_time) goto L_RewardTime; - if((gettime(6) == $@xmas_reward_start_month && gettime(5) >= $@xmas_reward_start_day) - || (gettime(6) == $@xmas_end_month && gettime(5) <= $@xmas_reward_end_day)) + if((gettime(6) == $@xmas_reward_start_month && gettime(5) >= $@xmas_reward_start_day + && (gettime(5) <= $@xmas_reward_end_day && $@xmas_reward_start_month == $@xmas_end_month + || !($@xmas_reward_start_month == $@xmas_end_month))) + || (gettime(6) == $@xmas_end_month && gettime(5) <= $@xmas_reward_end_day + && (gettime(5) >= $@xmas_reward_start_day && $@xmas_reward_start_month == $@xmas_end_month + || !($@xmas_reward_start_month == $@xmas_end_month))) + || (gettime(6) < $@xmas_end_month && gettime(6) > $@xmas_reward_start_month)) goto L_RewardTime; - if(gettime(6) == $@xmas_start_month) + if((gettime(6) >= $@xmas_start_month) || (gettime(6) <= $@xmas_end_month && gettime(5) <= $@xmas_reward_start_day)) goto L_EventTime; L_NoEventTime: |