1 files changed, 41 insertions, 21 deletions
diff --git a/npc/functions/daily.txt b/npc/functions/daily.txt
index ab97b038c..bcd25306b 100644
--- a/npc/functions/daily.txt
+++ b/npc/functions/daily.txt
@@ -57,29 +57,49 @@ function	script	daily_login_bonus_handler	{
             dispbottom l("##2 @@ Days login bonus: ##B2x @@, 1x @@##b", #LOGIN_STREAK, getitemlink(StrangeCoin), getitemlink(CasinoCoins));
         } else if (#LOGIN_STREAK == 27) {
             #LOGIN_ALLTIME+=1;
-            // Your prize is based on season
-            switch (season()) {
-                case AUTUMN:
-                    .@prize=ElixirOfLife; break;
-                case WINTER:
-                    .@prize=SilverGift; break;
-                case SPRING:
-                    .@prize=MercBoxB; break;
-                case SUMMER:
-                    .@prize=RightEyePatch; break;
+            .@am=1;
+            switch (#LOGIN_ALLTIME % 12) {
+            case 1:
+                if (#LOGIN_ALLTIME == 1)
+                    .@prize=RightEyePatch;
+                else
+                    .@prize=SilverGift;
+                break;
+            case 2:
+                .@prize=ArcmageBoxset; break;
+            case 3:
+                .@prize=MercBoxA; break;
+            case 4:
+                .@prize=AncientBlueprint; break;
+            case 5:
+                .@prize=StrangeCoin; .@am=120; break;
+            case 6:
+                if (#LOGIN_ALLTIME == 6) {
+                    dispbottom l("CONGRATULATIONS! For a semester worth of logins, you're getting a pet!");
+                    .@prize=PiouEgg; .@am=0;
+                    makepet Piou;
+                } else {
+                    .@prize=GoldenGift;
+                }
+                break;
+            case 7:
+                .@prize=GoldenGift; break;
+            case 8:
+                .@prize=MercBoxB; break;
+            case 9:
+                .@prize=PrismGift; break;
+            case 10:
+                .@prize=StrangeCoin; .@am=150; break;
+            case 11:
+                .@prize=MercBoxC; break;
+            case 0:
+                .@prize=MysteriousFruit; break;
+            default:
+                .@prize=ElixirOfLife; break;
             }
-            // Some special cases
-            if (#LOGIN_ALLTIME == 3)
-                .@prize=GoldenGift;
-            if (#LOGIN_ALLTIME == 8)
-                .@prize=PrismGift;
 
-            if (#LOGIN_ALLTIME == 12) {
-                dispbottom l("CONGRATULATIONS! For a year worth of logins, you're getting a pet!");
-                makepet Piou; // we must replace this before August 2019. (r18 probably)
-            }
-
-            getitem .@prize, 1;
+            if (.@am)
+                getitem .@prize, .@am;
             dispbottom l("##2 27 Days login bonus: ##B1x @@##b", getitemlink(.@prize));
         } else if (#LOGIN_STREAK == 21) {
             getitem BronzeGift, 1;