rewrite drop logic during Christmas

1 files changed, 20 insertions, 27 deletions

diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 843a7ffa6..2d6e9517a 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -26,34 +26,27 @@ function	script	sChristmas	{
         addmonsterdrop(Duck,        GingerBreadMan,  360);
         addmonsterdrop(WaterFairy,  GingerBreadMan, 1000);
 
-
-        if (gettime(5) <= 26) {
-            addmonsterdrop(Yeti,        ClosedChristmasBox, 3500);
-            addmonsterdrop(WaterFairy,  ClosedChristmasBox, 1080);
-            addmonsterdrop(AlphaMouboo, ClosedChristmasBox,  830);
-            addmonsterdrop(IcedFluffy,  ClosedChristmasBox,  675);
-            addmonsterdrop(BlueSlime,   ClosedChristmasBox,  420);
-            addmonsterdrop(Moggun,      ClosedChristmasBox,  400);
-            addmonsterdrop(SantaSlime,  ClosedChristmasBox,  360);
-            addmonsterdrop(AzulSlime,   ClosedChristmasBox,  200);
-            addmonsterdrop(Fluffy,      ClosedChristmasBox,  200);
-            addmonsterdrop(RudolphSlime,ClosedChristmasBox,   80);
-            addmonsterdrop(WhiteSlime,  ClosedChristmasBox,   30);
-            addmonsterdrop(GiantMaggot, ClosedChristmasBox,   15);
-        } else { // After Christmas, event drop rates are 50% smaller
-            addmonsterdrop(Yeti,        ClosedChristmasBox, 1750);
-            addmonsterdrop(WaterFairy,  ClosedChristmasBox,  540);
-            addmonsterdrop(AlphaMouboo, ClosedChristmasBox,  415);
-            addmonsterdrop(IcedFluffy,  ClosedChristmasBox,  340);
-            addmonsterdrop(BlueSlime,   ClosedChristmasBox,  210);
-            addmonsterdrop(Moggun,      ClosedChristmasBox,  200);
-            addmonsterdrop(SantaSlime,  ClosedChristmasBox,  180);
-            addmonsterdrop(AzulSlime,   ClosedChristmasBox,  100);
-            addmonsterdrop(Fluffy,      ClosedChristmasBox,  100);
-            addmonsterdrop(RudolphSlime,ClosedChristmasBox,   40);
-            addmonsterdrop(WhiteSlime,  ClosedChristmasBox,   15);
-            addmonsterdrop(GiantMaggot, ClosedChristmasBox,    8);
+        if (gettime(GETTIME_MONTH) == DECEMBER) {
+            if (gettime(GETTIME_DAY) <= 26)
+                .@m=10;
+            else
+                .@m=5;
+        } else {
+            .@m=2;
         }
+        // Drop rates, multiplied by 10 during Christmas (see .@m)
+        addmonsterdrop(Yeti,        ClosedChristmasBox, 350*.@m);
+        addmonsterdrop(WaterFairy,  ClosedChristmasBox, 108*.@m);
+        addmonsterdrop(AlphaMouboo, ClosedChristmasBox,  83*.@m);
+        addmonsterdrop(IcedFluffy,  ClosedChristmasBox,  67*.@m);
+        addmonsterdrop(BlueSlime,   ClosedChristmasBox,  42*.@m);
+        addmonsterdrop(Moggun,      ClosedChristmasBox,  40*.@m);
+        addmonsterdrop(SantaSlime,  ClosedChristmasBox,  36*.@m);
+        addmonsterdrop(AzulSlime,   ClosedChristmasBox,  20*.@m);
+        addmonsterdrop(Fluffy,      ClosedChristmasBox,  20*.@m);
+        addmonsterdrop(RudolphSlime,ClosedChristmasBox,   8*.@m);
+        addmonsterdrop(WhiteSlime,  ClosedChristmasBox,   3*.@m);
+        addmonsterdrop(GiantMaggot, ClosedChristmasBox,   1*.@m);
 
         // Should not last over two weeks
         addmonsterdrop(WaterFairy,  XmasGift,  54);