Register Christmas at Soul Menhir + Drop Rate Adjustments

2 files changed, 11 insertions, 1 deletions

diff --git a/conf/map/battle/drops.conf b/conf/map/battle/drops.conf
index d11ee2d3f..f7a8ab8fb 100644
--- a/conf/map/battle/drops.conf
+++ b/conf/map/battle/drops.conf
@@ -138,7 +138,10 @@ drops_by_luk: 0
 // Makes your LUK value affect drop rates on a relative basis.
 // Setting to 100 means each luk adds 1% chance to find items
 // (So at 100 luk, everything will have double chance of dropping).
-drops_by_luk2: 10
+// At current value (20), each luck point will boost 0.2% drop rates.
+// For the average drop (4% drop rate), this means 4*1,02=4.08% with 10 luck
+// A full build (100 luck) and 4% drop rate will give 4.8% drop rate.
+drops_by_luk2: 20
 
 // Whether or not Marine Spheres and Floras summoned by Alchemist drop items?
 // This setting has three available values:
diff --git a/npc/functions/soul_menhir.txt b/npc/functions/soul_menhir.txt
index b83526c8d..11a927708 100644
--- a/npc/functions/soul_menhir.txt
+++ b/npc/functions/soul_menhir.txt
@@ -7,6 +7,7 @@ function	script	SoulMenhir	{
         rif($@GM_EVENT, l("Send soul to the Mana Plane for GM events")), L_Aeros,
         rif($EVENT$ == "Easter", l("[Easter] Send soul to the Mana Forest!")), L_Easter,
         rif($EVENT$ == "Worker Day", l("[Worker Day] Send soul to the Contributor Cave!")), L_Worker,
+        rif($EVENT$ == "Christmas", l("[Christmas] Send soul to the Christmas Workshop!")), L_Xmas, // TODO: In future there'll be an event map
         l("Leave it alone."), L_Return;
 
 //L_Towel:
@@ -70,6 +71,12 @@ L_Worker:
     message strcharinfo(0), l("You are now at the Mana Plane of Existence, at the Contributor's Cave.");
     close;
 
+L_Xmas:
+    if ($EVENT$ != "Christmas") goto L_DontPanic;
+    warp "019-4-1", 32, 36;
+    message strcharinfo(0), l("You are now at the Christmas Workshop.");
+    close;
+
 L_DontPanic:
     message strcharinfo(0), l("(A strange barrier keeps you from touching the stone at this time.)");
     goto L_Return;