summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--world/map/npc/annuals/halloween/config.txt7
-rw-r--r--world/map/npc/annuals/halloween/trick_or_treat.txt4
2 files changed, 4 insertions, 7 deletions
diff --git a/world/map/npc/annuals/halloween/config.txt b/world/map/npc/annuals/halloween/config.txt
index d3d0f616..59839668 100644
--- a/world/map/npc/annuals/halloween/config.txt
+++ b/world/map/npc/annuals/halloween/config.txt
@@ -28,7 +28,6 @@
// 1277 Jester Mask 2
// 1279 Goblin Mask 4
// 4027 Yeti Mask 4
-// 616 Axe Hat 4
// Per-NPC stuff
// $@halloween_npc_<name> = constants for @halloween_npc_id, the index into the array
@@ -125,7 +124,7 @@ L_Main:
set $@halloween_reward_time, 2;
// How many, maximum is 8
- set $@halloween_memory_count, 5;
+ set $@halloween_memory_count, 8;
// Level to go trick-or-treating
set $@halloween_min_level, 10;
// Age to go trick-or-treating
@@ -155,8 +154,8 @@ L_Main:
840; // OrangeLollipop
set $@halloween_sweets_num, getarraysize($@halloween_sweets);
- setarray $@halloween_mask_IDs, 678, 679, 1221, 634, 615, 639, 769, 801, 1218, 1276, 1277, 1279, 4027, 616;
- setarray $@halloween_scare_factors, 2, 4, 4, 4, 2, 3, 2, 2, 1, 3, 2, 4, 4, 4;
+ setarray $@halloween_mask_IDs, 678, 679, 1221, 634, 615, 639, 769, 801, 1218, 1276, 1277, 1279, 4027;
+ setarray $@halloween_scare_factors, 2, 4, 4, 4, 2, 3, 2, 2, 1, 3, 2, 4, 4;
if (getarraysize($@halloween_mask_IDs) != getarraysize($@halloween_scare_factors))
goto L_HalloweenError;
diff --git a/world/map/npc/annuals/halloween/trick_or_treat.txt b/world/map/npc/annuals/halloween/trick_or_treat.txt
index c94977ab..3407efd5 100644
--- a/world/map/npc/annuals/halloween/trick_or_treat.txt
+++ b/world/map/npc/annuals/halloween/trick_or_treat.txt
@@ -162,9 +162,7 @@ L_Tricking_Reward:
if (@karma >= 16)
set @scare_factor, rand(@scare_factor / 2, @scare_factor);
if (@karma >= 256)
- set @scare_factor, rand(@scare_factor / 2, @scare_factor);
- if (@karma >= 4096)
- set @scare_factor, rand(@scare_factor / 2, @scare_factor);
+ goto L_Tricking_End;
if (@scare_factor < 1)
set @scare_factor, 1;
goto L_Tricking_Reward_Loop;