summaryrefslogtreecommitdiff
path: root/world/map/npc/annuals/xmas/config.txt
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/annuals/xmas/config.txt')
-rw-r--r--world/map/npc/annuals/xmas/config.txt32
1 files changed, 10 insertions, 22 deletions
diff --git a/world/map/npc/annuals/xmas/config.txt b/world/map/npc/annuals/xmas/config.txt
index e95494d3..8f7c9139 100644
--- a/world/map/npc/annuals/xmas/config.txt
+++ b/world/map/npc/annuals/xmas/config.txt
@@ -262,30 +262,18 @@ L_Main:
set $@xmas_spawn_y2, 89;
set $@xmas_respawn_count, 9;
- 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) || (gettime(6) <= $@xmas_end_month && gettime(5) <= $@xmas_reward_start_day))
- goto L_EventTime;
- goto L_NoEventTime;
-
-L_NoEventTime:
- if($XMAS_TIME_KEY[5] < gettime(7))
- setarray $XMAS_TIME_KEY, $XMAS_TIME_KEY[0],$XMAS_TIME_KEY[1],$XMAS_TIME_KEY[2],$XMAS_TIME_KEY[3],$XMAS_TIME_KEY[4],gettime(7);
- set $@xmas_time, $@xmas_no_event_time;
- goto L_Return;
+ set $@start_month, $@xmas_start_month;
+ set $@end_month, $@xmas_end_month;
+ set $@start_day, 1;
+ set $@end_day, $@xmas_reward_end_day;
+ set $@reward_start_month, $@xmas_reward_start_month;
+ set $@reward_start_day, $@xmas_reward_start_day;
-L_EventTime:
- set $@xmas_time, $@xmas_event_time;
- goto L_Return;
+ callfunc "GetEventTime";
+ set $@xmas_time, $@event_time;
-L_RewardTime:
- set $@xmas_time, $@xmas_reward_time;
+ if($@xmas_time == 0 && $XMAS_TIME_KEY[5] < gettime(7))
+ setarray $XMAS_TIME_KEY, $XMAS_TIME_KEY[0],$XMAS_TIME_KEY[1],$XMAS_TIME_KEY[2],$XMAS_TIME_KEY[3],$XMAS_TIME_KEY[4],gettime(7);
goto L_Return;
L_Return: