summaryrefslogtreecommitdiff
path: root/world/map/npc/xmas/2011/beddingHelper.txt
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/xmas/2011/beddingHelper.txt')
-rw-r--r--world/map/npc/xmas/2011/beddingHelper.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/world/map/npc/xmas/2011/beddingHelper.txt b/world/map/npc/xmas/2011/beddingHelper.txt
index 5923b70f..7d424bd5 100644
--- a/world/map/npc/xmas/2011/beddingHelper.txt
+++ b/world/map/npc/xmas/2011/beddingHelper.txt
@@ -9,9 +9,11 @@
030-2.gat,37,77,0|script|Osmo|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 @bedding_amount, 10;