Move some code around

1 files changed, 21 insertions, 19 deletions

diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 5d2ddf256..f6c99a8a1 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -8,24 +8,7 @@
 
 // Christmas cannot be on GlobalEventMenu because it affects seasons system
 function	script	sChristmas	{
-        // Add Christmas drops
-        addmonsterdrop(Moggun,      XmasCake,  800);
-        addmonsterdrop(AlphaMouboo, XmasCake,  920);
-        addmonsterdrop(BlueSlime,   XmasCake, 1000);
-        addmonsterdrop(SantaSlime,  XmasCake, 1200);
-        addmonsterdrop(IcedFluffy,  XmasCake, 1500);
-        addmonsterdrop(Yeti,        XmasCake, 5000);
-
-        addmonsterdrop(Bandit,      XmasCandyCane,  300);
-        addmonsterdrop(Mouboo,      XmasCandyCane,  480);
-        addmonsterdrop(WhiteSlime,  XmasCandyCane,  500);
-        addmonsterdrop(RudolphSlime,XmasCandyCane, 1000);
-        addmonsterdrop(Fluffy,      XmasCandyCane, 2000);
-        addmonsterdrop(AzulSlime,   XmasCandyCane, 2000);
-
-        addmonsterdrop(Duck,        GingerBreadMan,  360);
-        addmonsterdrop(WaterFairy,  GingerBreadMan, 1000);
-
+        // Determine the drop rates based on month, and Christmas proximity
         if (gettime(GETTIME_MONTH) == DECEMBER) {
             if (gettime(GETTIME_DAYOFMONTH) <= 26)
                 .@m=10;
@@ -34,7 +17,26 @@ function	script	sChristmas	{
         } else {
             .@m=5;
         }
-        // Drop rates, multiplied by 10 during Christmas (see .@m)
+
+        // Add Christmas drops
+        addmonsterdrop(Moggun,      XmasCake,  80*.@m);
+        addmonsterdrop(AlphaMouboo, XmasCake,  92*.@m);
+        addmonsterdrop(BlueSlime,   XmasCake, 100*.@m);
+        addmonsterdrop(SantaSlime,  XmasCake, 120*.@m);
+        addmonsterdrop(IcedFluffy,  XmasCake, 150*.@m);
+        addmonsterdrop(Yeti,        XmasCake, 500*.@m);
+
+        addmonsterdrop(Bandit,      XmasCandyCane,  30*.@m);
+        addmonsterdrop(Mouboo,      XmasCandyCane,  48*.@m);
+        addmonsterdrop(WhiteSlime,  XmasCandyCane,  50*.@m);
+        addmonsterdrop(RudolphSlime,XmasCandyCane, 100*.@m);
+        addmonsterdrop(Fluffy,      XmasCandyCane, 200*.@m);
+        addmonsterdrop(AzulSlime,   XmasCandyCane, 200*.@m);
+
+        addmonsterdrop(Duck,        GingerBreadMan,  36*.@m);
+        addmonsterdrop(WaterFairy,  GingerBreadMan, 100*.@m);
+
+        // Event drop rates, multiplied by 10 during Christmas (see .@m)
         addmonsterdrop(Yeti,        ClosedChristmasBox, 350*.@m);
         addmonsterdrop(WaterFairy,  ClosedChristmasBox, 108*.@m);
         addmonsterdrop(AlphaMouboo, ClosedChristmasBox,  83*.@m);