summaryrefslogtreecommitdiff
path: root/world/map/npc/annuals/halloween
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/annuals/halloween')
-rw-r--r--world/map/npc/annuals/halloween/config.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/world/map/npc/annuals/halloween/config.txt b/world/map/npc/annuals/halloween/config.txt
index 226d8bbb..0401fc3d 100644
--- a/world/map/npc/annuals/halloween/config.txt
+++ b/world/map/npc/annuals/halloween/config.txt
@@ -339,11 +339,11 @@ L_Main:
if(gettime(6) <= $@halloween_end_month && gettime(5) > $@halloween_reward_end_day)
goto L_NoEventTime;
- if((gettime(6) == $@halloween_reward_start_month && gettime(5) >= $@halloween_reward_start_day
+ if((gettime(6) == $@halloween_reward_start_month && gettime(5) >= $@halloween_reward_start_day
&& (gettime(5) <= $@halloween_reward_end_day && $@halloween_reward_start_month == $@halloween_end_month
|| !($@halloween_reward_start_month == $@halloween_end_month)))
- || (gettime(6) == $@halloween_end_month && gettime(5) <= $@halloween_reward_end_day
- && (gettime(5) >= $@halloween_reward_start_day && $@halloween_reward_start_month == $@halloween_end_month
+ || (gettime(6) == $@halloween_end_month && gettime(5) <= $@halloween_reward_end_day
+ && (gettime(5) >= $@halloween_reward_start_day && $@halloween_reward_start_month == $@halloween_end_month
|| !($@halloween_reward_start_month == $@halloween_end_month)))
|| (gettime(6) < $@halloween_end_month && gettime(6) > $@halloween_reward_start_month))
goto L_RewardTime;
@@ -372,6 +372,5 @@ L_Return:
L_HalloweenError:
debugmes "Halloween is Dead Jim.";
- gmcommand "@mapexit";
- end;
+ mapexit;
}