Halloween event:

- fix, so reward is given only once
- add missing dialogue in for Kfahr
- change dialogue when giving reward and add some missing \"
- fix on counting logic when giving sweets
- remove some unobtainable candy

2 files changed, 6 insertions, 9 deletions

diff --git a/world/map/npc/halloween/2011/config.txt b/world/map/npc/halloween/2011/config.txt
index 31b863e0..663f34ef 100644
--- a/world/map/npc/halloween/2011/config.txt
+++ b/world/map/npc/halloween/2011/config.txt
@@ -61,7 +61,6 @@ OnInit:
     // TODO: review this list
     // all sweets are equal currently
     setarray $@hw2011_sweets$,
-        "CaramelApple",
         "OrangeCupcake",
         "ChocolateCake",
         "Candy",
@@ -76,9 +75,6 @@ OnInit:
         "WhiteCake",
         "OrangeCake",
         "AppleCake",
-        "LollipopColor1",
-        "LollipopColor2",
-        "LollipopColor3",
         "TonoriDelight",
         "Marshmallow",
         "JellySkull",
@@ -143,8 +139,8 @@ OnInit:
     set $@hw2011_greetings$[$@n],       "\"Ah, yes!\" He rubs his hands. \"Trick away, then!\"";
     set $@hw2011_trick_notscary$[$@n],  "Meh... I'm only trick-or-treating you to avoid listening to your BORING stories.";
     set $@hw2011_react_notscary$[$@n],  "\"Boring?\" He grins. \"You must be mistaking me for someone else.\"";
-    set $@hw2011_trick_scary$[$@n],     " TODO ";
-    set $@hw2011_react_scary$[$@n],     "\" TODO \"";
+    set $@hw2011_trick_scary$[$@n],     "Did you hear the bad news already? They made up a law prohibiting to serve alcoholic drinks! That means no more beer!";
+    set $@hw2011_react_scary$[$@n],     "\"What? But- but- why do they- oh, you tricked me. I was about to really get worried for a moment.\"";
     set $@hw2011_trick_veryscary$[$@n], "Have you heard? Tulimshar was destroyed by a giant Desert Worm!";
     set $@hw2011_react_veryscary$[$@n], "\"What!?\" Kfahr stares. \"And no one called for me? This is appalling! But - what? That was your trick? Hm, nice one. You almost had me fooled!\"";
 
diff --git a/world/map/npc/halloween/2011/trick_or_treat.txt b/world/map/npc/halloween/2011/trick_or_treat.txt
index f2de95a4..e765d8b6 100644
--- a/world/map/npc/halloween/2011/trick_or_treat.txt
+++ b/world/map/npc/halloween/2011/trick_or_treat.txt
@@ -86,7 +86,7 @@ L_MaskMemoryNo:
     set @loop, 0;
     set @sweets_types, 0;
 L_Count_Sweets:
-    if (!$@hw2011_sweets$[@loop])
+    if ($@hw2011_sweets$[@loop] == "")
         goto L_Check_Inventory;
     if (countitem($@hw2011_sweets$[@loop]))
         set @sweets_types, @sweets_types + 1;
@@ -114,14 +114,15 @@ L_Check_Karma:
     // assert: (hw2011 & 0xffff) < $@hw2011_num_npcs
     if (rand($@hw2011_num_npcs - (hw2011 & 0xffff)))
         goto L_Tricking_Trick_or_Treat;
-    mes "Here, have something to freshen you up after your long night";
+    mes "\"All this candy isn't healthy, here take this to have a break from it.\"";
     getitem $@hw2011_big_reward$, 1;
+    set hw2011, hw2011 | $@hw2011_got_big_reward;
     // you get the big reward first, then the main treats
     // otherwise it would be too complicated, and/or possibly unfair
     goto L_Tricking_Trick_or_Treat;
 
 L_Cheater:
-    mes "I recognize you despite your mask, you have been taking sweets you do not deserve.";
+    mes "\"I recognize you despite your mask, you have been taking sweets you do not deserve.\"";
     if ((hw2011 & 0xFFFF) != 0xFFFF)
         set hw2011, hw2011 + 1;
     goto L_Close;