From c3f4578a4e08a364a3257fc4b49ccf309f9f128c Mon Sep 17 00:00:00 2001
From: Jessica Tölke <jtoelke@mail.upb.de>
Date: Sat, 22 Oct 2011 21:51:36 +0200
Subject: Adding the new lollipops to Halloween event and correcting a number.

---
 world/map/npc/halloween/2011/config.txt         | 5 ++++-
 world/map/npc/halloween/2011/trick_or_treat.txt | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/world/map/npc/halloween/2011/config.txt b/world/map/npc/halloween/2011/config.txt
index 663f34ef..a120158a 100644
--- a/world/map/npc/halloween/2011/config.txt
+++ b/world/map/npc/halloween/2011/config.txt
@@ -78,7 +78,10 @@ OnInit:
         "TonoriDelight",
         "Marshmallow",
         "JellySkull",
-        "CandyPumpkin";
+        "CandyPumpkin",
+        "CranberryLollipop",
+        "GrapeLollipop",
+        "OrangeLollipop";
 
     setarray $@hw2011_mask_IDs, 678, 679, 1221, 634, 615, 639, 769, 801, 1218, 1276, 1277, 1279, 4027, 616;
     setarray $@hw2011_scare_factors, 2, 4, 4, 4, 2, 3, 2, 2, 1, 3, 2, 4, 4, 4;
diff --git a/world/map/npc/halloween/2011/trick_or_treat.txt b/world/map/npc/halloween/2011/trick_or_treat.txt
index e765d8b6..5dea60a7 100644
--- a/world/map/npc/halloween/2011/trick_or_treat.txt
+++ b/world/map/npc/halloween/2011/trick_or_treat.txt
@@ -165,7 +165,7 @@ L_Tricking_Reward:
     if (!@scare_factor)
         goto L_Tricking_End;
     // NOTE: it gives out one piece at a time, but can loop several times
-    getitem $@hw2011_sweets$[rand(21)], 1;
+    getitem $@hw2011_sweets$[rand(20)], 1;
 
     set @scare_factor, @scare_factor - 1;
     goto L_Tricking_Reward;
-- 
cgit v1.2.3-60-g2f50