Merge remote-tracking branch 'v0id/easter-fix' into test

2 files changed, 13 insertions, 0 deletions

diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index 6bed62d2..f6c3ccde 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -390,6 +390,7 @@ FX_BLUE_MAGIC_CAST       40
 FX_MAGIC_BLUE_TELEPORT   41
 FX_MAGIC_DARK_EXPLOSION  42
 FX_PUMPKIN_EXPLOSION 43
+FX_GETITEM           44
 FX_MAGIC_SHIELD_ENDS 111
 FX_ELECTRICITY_RED   114
 FX_ELECTRICITY_BLUE  115
diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt
index 3a97a9ea..fa0a0aa1 100644
--- a/world/map/npc/008-1/annualeaster.txt
+++ b/world/map/npc/008-1/annualeaster.txt
@@ -15,6 +15,8 @@ function|script|AnnualEasterEvent|{
     if (BaseLevel < 20)
         goto L_EndTooYoung;
 
+    if (@eastertimepenalty == 0)
+        goto L_WarmUp;
     // prevent clicking multiple times:
     if (gettimetick(2) < @eastertimepenalty + $@EASTER_FOUND_WAIT_TIME)
         goto L_End2;
@@ -32,6 +34,7 @@ function|script|AnnualEasterEvent|{
     if (@random  < @tmp)     getitem $@SmallAnnualEasterItems$[@random], rand(1, 2);
     if (@random == @tmp)     getexp rand(200), 0;
     if (@random == @tmp + 1) set Zeny, Zeny + rand(50);
+    misceffect FX_GETITEM, strcharinfo(0);
 
     // give out a better reward occasionally:
     // standard case is branch taken, so only if rand yields 0, medium rewarding.
@@ -40,6 +43,7 @@ function|script|AnnualEasterEvent|{
 
     set @random, rand(getarraysize($@MediumAnnualEasterRewards$));
     getitem $@MediumAnnualEasterRewards$[@random], 1;
+    misceffect FX_GETITEM, strcharinfo(0);
 
 NoEasterEgg:
 
@@ -70,6 +74,7 @@ NoEasterEgg:
     // now hand out the specific item:
     set @rewardindex, @rewardindex % getarraysize($@FinalAnnualEasterReward$);
     getitem $@FinalAnnualEasterReward$[@rewardindex], 1;
+    misceffect FX_GETITEM, strcharinfo(0);
     message strcharinfo(0), "This is really special. You won't find anything like this again.";
     goto L_End1;
 
@@ -85,6 +90,13 @@ L_EndTooYoung:
     message strcharinfo(0), "The nest is empty.";
     goto L_End1;
 
+L_WarmUp:
+    set @eastertimepenalty, gettimetick(2);
+    getitem "GreenApple", 1;
+    misceffect FX_GETITEM, strcharinfo(0);
+    message strcharinfo(0), "Hmmm eggs! Maybe you can find something nice there!";
+    goto L_End1;
+
 L_End2:
     message strcharinfo(0), "Don't be greedy! You just found something a moment ago.";
     set @eastertimepenalty, @eastertimepenalty + 5;