From 9f2465632de25155aed319a960529004f67af8ed Mon Sep 17 00:00:00 2001
From: Jessica Tölke <jtoelke@mail.upb.de>
Date: Thu, 15 Dec 2011 14:44:24 +0100
Subject: Christmas Event 2011: fix of checking the characters age, expand
 reward time

---
 world/map/npc/xmas/2011/badguy.txt                |  8 +++--
 world/map/npc/xmas/2011/beddingHelper.txt         |  6 ++--
 world/map/npc/xmas/2011/bodyguards.txt            | 24 ++++++++-----
 world/map/npc/xmas/2011/chiefHelper.txt           |  8 +++--
 world/map/npc/xmas/2011/deliverPresentsHelper.txt |  6 ++--
 world/map/npc/xmas/2011/doll.txt                  | 12 ++++---
 world/map/npc/xmas/2011/emptyBoxesHelper.txt      |  6 ++--
 world/map/npc/xmas/2011/entranceHelpers.txt       | 12 ++++---
 world/map/npc/xmas/2011/glitterHelper.txt         |  6 ++--
 world/map/npc/xmas/2011/guardOfHonor.txt          | 27 ++++++++++-----
 world/map/npc/xmas/2011/illHelper.txt             |  6 ++--
 world/map/npc/xmas/2011/leatherBall.txt           | 12 ++++---
 world/map/npc/xmas/2011/plushMouboo.txt           | 12 ++++---
 world/map/npc/xmas/2011/reinboos.txt              | 42 +++++++++++++++--------
 world/map/npc/xmas/2011/santa.txt                 |  6 ++--
 world/map/npc/xmas/2011/stickReinboo.txt          | 12 ++++---
 world/map/npc/xmas/2011/wrappingPaperHelper.txt   |  6 ++--
 world/map/npc/xmas/2011/xmas2011config.txt        |  1 +
 18 files changed, 141 insertions(+), 71 deletions(-)

(limited to 'world/map/npc')

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;
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;
diff --git a/world/map/npc/xmas/2011/bodyguards.txt b/world/map/npc/xmas/2011/bodyguards.txt
index 4ce1900e..6f2a84c7 100644
--- a/world/map/npc/xmas/2011/bodyguards.txt
+++ b/world/map/npc/xmas/2011/bodyguards.txt
@@ -4,9 +4,11 @@
 
 030-2.gat,76,88,0|script|Vilhelmiina|335,{
 
-    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;
 
     mes "[Vilhelmiina]";
@@ -35,9 +37,11 @@ L_Close:
 
 030-2.gat,80,88,0|script|Verneri|334,{
 
-    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;
 
     mes "[Verneri]";
@@ -66,7 +70,8 @@ L_Close:
 }
 
 030-2.gat,152,22,0|script|Vanamo|332,{
-    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;
 
     mes "[Vanamo]";
@@ -81,7 +86,8 @@ L_NoEvent:
 }
 
 030-2.gat,89,23,0|script|Vihtori|333,{
-    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;
 
     mes "[Vihtori]";
@@ -98,7 +104,8 @@ L_NoEvent:
 // door to Santa's room
 030-2.gat,78,87,0|script|#door|127,1,1{
 
-    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;
     end;
 
@@ -110,7 +117,8 @@ L_RewardTime:
 // entrance of the building
 030-1.gat,99,53,0|script|#Door|127,1,1,{
 
-    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))
         end;
 
     warp "030-2.gat", 88, 50;
diff --git a/world/map/npc/xmas/2011/chiefHelper.txt b/world/map/npc/xmas/2011/chiefHelper.txt
index 6324c1c9..dcca2ed4 100644
--- a/world/map/npc/xmas/2011/chiefHelper.txt
+++ b/world/map/npc/xmas/2011/chiefHelper.txt
@@ -4,11 +4,13 @@
 
 030-2.gat,87,77,0|script|Chief Warrick|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;
-    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;
 
     if (xmas11 & $@xmas11_talkedToChief) goto L_Helping;
diff --git a/world/map/npc/xmas/2011/deliverPresentsHelper.txt b/world/map/npc/xmas/2011/deliverPresentsHelper.txt
index 62949cf7..8b49d196 100644
--- a/world/map/npc/xmas/2011/deliverPresentsHelper.txt
+++ b/world/map/npc/xmas/2011/deliverPresentsHelper.txt
@@ -5,9 +5,11 @@
 
 030-2.gat,127,41,0|script|Aaron|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 @plushmouboo, (xmas11 & $@xmas11_PlushMoubooMask) >> $@xmas11_PlushMoubooShift;
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;
diff --git a/world/map/npc/xmas/2011/emptyBoxesHelper.txt b/world/map/npc/xmas/2011/emptyBoxesHelper.txt
index 428acfe8..afca6a4d 100644
--- a/world/map/npc/xmas/2011/emptyBoxesHelper.txt
+++ b/world/map/npc/xmas/2011/emptyBoxesHelper.txt
@@ -5,9 +5,11 @@
 
 030-2.gat,140,41,0|script|Urmas|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 @log_amount, 2;
diff --git a/world/map/npc/xmas/2011/entranceHelpers.txt b/world/map/npc/xmas/2011/entranceHelpers.txt
index 99a501db..38ba818c 100644
--- a/world/map/npc/xmas/2011/entranceHelpers.txt
+++ b/world/map/npc/xmas/2011/entranceHelpers.txt
@@ -4,9 +4,11 @@
 
 030-2.gat,74,29,0|script|Vellamo|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;
     mes "[Vellamo]";
     mes "\"Those terrible slimes! It's a disaster!";
@@ -39,9 +41,11 @@ L_Close:
 // welcome Guy
 030-2.gat,87,40,0|script|Valtteri|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;
 
     mes "[Valterri]";
diff --git a/world/map/npc/xmas/2011/glitterHelper.txt b/world/map/npc/xmas/2011/glitterHelper.txt
index b2b6bf43..79a40146 100644
--- a/world/map/npc/xmas/2011/glitterHelper.txt
+++ b/world/map/npc/xmas/2011/glitterHelper.txt
@@ -10,9 +10,11 @@
 
 030-2.gat,31,81,0|script|Eljas|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 @red_amount, 5;
diff --git a/world/map/npc/xmas/2011/guardOfHonor.txt b/world/map/npc/xmas/2011/guardOfHonor.txt
index 37adfc42..57c0cc1e 100644
--- a/world/map/npc/xmas/2011/guardOfHonor.txt
+++ b/world/map/npc/xmas/2011/guardOfHonor.txt
@@ -5,7 +5,8 @@
 // outside of the building
 030-1.gat,89,51,0|script|Grigory the Nutcracker|330,{
 
-    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;
 
     mes "[Grigory the Nutcracker]";
@@ -20,7 +21,8 @@ L_NoEvent:
 
 030-1.gat,89,54,0|script|Vadim the Nutcracker|330,{
 
-    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;
 
     mes "[Vadim the Nutcracker]";
@@ -36,7 +38,8 @@ L_NoEvent:
 // in the entrance area
 030-2.gat,83,43,0|script|Andrey the Nutcracker|330,{
 
-    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;
 
     mes "[Andrey the Nutcracker]";
@@ -53,7 +56,8 @@ L_NoEvent:
 
 030-2.gat,99,23,0|script|Eugeny the Nutcracker|330,{
 
-    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;
 
     mes "[Eugeny the Nutcracker]";
@@ -75,7 +79,8 @@ L_NoEvent:
 
 030-2.gat,77,23,0|script|Leonid the Nutcracker|330,{
 
-    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;
 
     mes "[Leonid the Nutcracker]";
@@ -92,7 +97,8 @@ L_NoEvent:
 // in office
 030-2.gat,47,81,0|script|Yakov the Nutcracker|330,{
 
-    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;
 
     mes "[Yakov the Nutcracker]";
@@ -115,9 +121,11 @@ L_NoEvent:
 // in the room before Santa's
 030-2.gat,96,77,0|script|Taras the Nutcracker|330,{
 
-    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;
 
     mes "[Taras the Nutcracker]";
@@ -139,7 +147,8 @@ L_NoEvent:
 
 030-2.gat,99,77,0|script|Stepan the Nutcracker|330,{
 
-    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;
 
     mes "[Stepan the Nutcracker]";
diff --git a/world/map/npc/xmas/2011/illHelper.txt b/world/map/npc/xmas/2011/illHelper.txt
index ba903d52..48f8600d 100644
--- a/world/map/npc/xmas/2011/illHelper.txt
+++ b/world/map/npc/xmas/2011/illHelper.txt
@@ -9,9 +9,11 @@
 
 030-2.gat,127,89,0|script|Ismo|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;
 
     if (xmas11 & $@xmas11_PotionDone) goto L_Done;
diff --git a/world/map/npc/xmas/2011/leatherBall.txt b/world/map/npc/xmas/2011/leatherBall.txt
index f7c007d8..66e3be2b 100644
--- a/world/map/npc/xmas/2011/leatherBall.txt
+++ b/world/map/npc/xmas/2011/leatherBall.txt
@@ -10,9 +10,11 @@
 
 030-2.gat,37,81,0|script|Tarmo|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 @ball, (xmas11 & $@xmas11_BallMask) >> $@xmas11_BallShift;
@@ -62,9 +64,11 @@ L_Close:
 
 030-2.gat,154,33,0|script|Iivo|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 @ball, (xmas11 & $@xmas11_BallMask) >> $@xmas11_BallShift;
diff --git a/world/map/npc/xmas/2011/plushMouboo.txt b/world/map/npc/xmas/2011/plushMouboo.txt
index 66c1dd77..9c9b1b9b 100644
--- a/world/map/npc/xmas/2011/plushMouboo.txt
+++ b/world/map/npc/xmas/2011/plushMouboo.txt
@@ -10,9 +10,11 @@
 
 030-2.gat,31,77,0|script|Rikhard|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 @plushmouboo, (xmas11 & $@xmas11_PlushMoubooMask) >> $@xmas11_PlushMoubooShift;
@@ -74,9 +76,11 @@ L_Close:
 
 030-2.gat,135,31,0|script|Launo|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 @plushmouboo, (xmas11 & $@xmas11_PlushMoubooMask) >> $@xmas11_PlushMoubooShift;
diff --git a/world/map/npc/xmas/2011/reinboos.txt b/world/map/npc/xmas/2011/reinboos.txt
index ea606bef..b79e1f5b 100644
--- a/world/map/npc/xmas/2011/reinboos.txt
+++ b/world/map/npc/xmas/2011/reinboos.txt
@@ -12,9 +12,11 @@
 
 030-1.gat,103,54,0|script|Grombadil|105,{
 
-    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 (xmas11 & $@xmas11_startedReinbooSearch) goto L_Search;
@@ -154,9 +156,11 @@ L_Close:
 
 030-1.gat,96,57,0|script|Reimeles|170,{
 
-    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;
 
     mes "[Reimeles the Reinboo]";
@@ -176,9 +180,11 @@ L_RewardTime:
 
 030-1.gat,100,46,0|script|Leimeres|170,{
 
-    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;
 
     mes "[Leimeres the Reinboo]";
@@ -200,9 +206,11 @@ L_RewardTime:
     set @cake_amount, 3;
     set @apple_amount, 5;
 
-    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 ((xmas11 & $@xmas11_firstReinboo) && (xmas11 & $@xmas11_firstReinbooDone)) goto L_Bad;
@@ -321,9 +329,11 @@ L_Close:
     set @cake_amount, 3;
     set @apple_amount, 5;
 
-    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 ((xmas11 & $@xmas11_secondReinboo) && (xmas11 & $@xmas11_secondReinbooDone)) goto L_Bad;
@@ -441,9 +451,11 @@ L_Close:
     set @cake_amount, 3;
     set @apple_amount, 5;
 
-    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 ((xmas11 & $@xmas11_thirdReinboo) && (xmas11 & $@xmas11_thirdReinbooDone)) goto L_Bad;
@@ -560,9 +572,11 @@ L_Close:
     set @cake_amount, 3;
     set @apple_amount, 5;
 
-    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 ((xmas11 & $@xmas11_fourthReinboo) && (xmas11 & $@xmas11_fourthReinbooDone)) goto L_Bad;
diff --git a/world/map/npc/xmas/2011/santa.txt b/world/map/npc/xmas/2011/santa.txt
index 028239a1..de2265d9 100644
--- a/world/map/npc/xmas/2011/santa.txt
+++ b/world/map/npc/xmas/2011/santa.txt
@@ -5,9 +5,11 @@
 
 030-2.gat,197,62,0|script|Santa|105,{
 
-    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 (xmas11 & $@xmas11_talkedToChief) goto L_Helping;
diff --git a/world/map/npc/xmas/2011/stickReinboo.txt b/world/map/npc/xmas/2011/stickReinboo.txt
index 0ed076ff..95e84b54 100644
--- a/world/map/npc/xmas/2011/stickReinboo.txt
+++ b/world/map/npc/xmas/2011/stickReinboo.txt
@@ -10,9 +10,11 @@
 
 030-2.gat,31,85,0|script|Akseli|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 @stickreinboo, (xmas11 & $@xmas11_StickReinbooMask) >> $@xmas11_StickReinbooShift;
@@ -65,9 +67,11 @@ L_Close:
 
 030-2.gat,147,23,0|script|Kalevi|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 @stickreinboo, (xmas11 & $@xmas11_StickReinbooMask) >> $@xmas11_StickReinbooShift;
diff --git a/world/map/npc/xmas/2011/wrappingPaperHelper.txt b/world/map/npc/xmas/2011/wrappingPaperHelper.txt
index 7a96c7b5..9c1b9064 100644
--- a/world/map/npc/xmas/2011/wrappingPaperHelper.txt
+++ b/world/map/npc/xmas/2011/wrappingPaperHelper.txt
@@ -6,9 +6,11 @@
 
 030-2.gat,140,31,0|script|Reino|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 @reed_amount, 2;
diff --git a/world/map/npc/xmas/2011/xmas2011config.txt b/world/map/npc/xmas/2011/xmas2011config.txt
index c2c72342..54f7140c 100644
--- a/world/map/npc/xmas/2011/xmas2011config.txt
+++ b/world/map/npc/xmas/2011/xmas2011config.txt
@@ -2,6 +2,7 @@
 OnInit:
     set $@xmas2011_start_day, 10;
     set $@xmas2011_reward_start_day, 25;
+    set $@xmas2011_reward_end_day, 6;
     set $@xmas2011_year, 2011;
     set $@xmas2011_glove_id, 2160;
 
-- 
cgit v1.2.3-60-g2f50