TMW2 Day Login Bonus - 1 Mercenary Boxset ++ (maximum rarity)

2 files changed, 19 insertions, 2 deletions

diff --git a/npc/commands/motd.txt b/npc/commands/motd.txt
index 7fadf375e..70ff3b690 100644
--- a/npc/commands/motd.txt
+++ b/npc/commands/motd.txt
@@ -182,13 +182,21 @@ OnPCLoginEvent:
     daily_login_bonus_handler();
     end;
 
-OnClock0000:
-    .login_ref=gettime(5); // Day of month
+OnClock0003:
+    // Reset TMW2 Login Bonus on February and April
+    if (!$@TMW2_357GDQST) {
+        if (gettime(6) == FEBRUARY || gettime(6) == APRIL) {
+            DelAccRegFromEveryPlayer("#TMW2_LOGINBONUS");
+            $@TMW2_357GDQST=1;
+        }
+    }
     end;
 
 OnInit:
+    /*
     .login_ref=gettime(5);
     .daylength=(60*60*24);
+    */
     MOTD_debug_text;
     .size = getarraysize($MOTD_Messages$);
     .dsize = getarraysize($@Debug_Messages$);
diff --git a/npc/functions/daily.txt b/npc/functions/daily.txt
index f4d84d802..8c7ea8278 100644
--- a/npc/functions/daily.txt
+++ b/npc/functions/daily.txt
@@ -112,6 +112,15 @@ function	script	daily_login_bonus_handler	{
                 dispbottom "##B##2"+l("It's TMW2 Project anniversary!")+" "+l("We thank every developer which helped this project thus far!")+"##b##0";
             }
         }
+        if (gettime(6) == MARCH) {
+            if (#TMW2_LOGINBONUS != gettime(GETTIME_YEAR) && gettime(5) == 2) {
+                #TMW2_LOGINBONUS=gettime(GETTIME_YEAR);
+                getitem MercBoxC, 1;
+                // TMW2 Day is server, not project.
+                // Therefore, players get extra reward
+                dispbottom "##B##2"+l("It's TMW2 Server anniversary!")+" "+l("We thank every player, because without them, this would be nothing!")+"##b##0";
+            }
+        }
         if (gettime(6) == DECEMBER) {
             if (!#XMAS_LOGINBONUS && gettime(5) >= 24 && gettime(5) <= 26) {
                 #XMAS_LOGINBONUS=1;