From d5501b061b6fb92643bb36c523bde62bcf7181bc Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Sat, 11 Oct 2014 11:20:24 -0500
Subject: Halloween Annual Base Commit

---
 world/map/npc/annuals/xmas/config.txt | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'world/map/npc/annuals/xmas/config.txt')

diff --git a/world/map/npc/annuals/xmas/config.txt b/world/map/npc/annuals/xmas/config.txt
index e63c07e2..e8ac5cc2 100644
--- a/world/map/npc/annuals/xmas/config.txt
+++ b/world/map/npc/annuals/xmas/config.txt
@@ -80,9 +80,6 @@ L_Main:
     set $@xmas_event_time, 1;
     set $@xmas_reward_time, 2;
 
-    // Xmas debug (sets time)
-    set $@xmas_debug, 0;
-
     // Main Quest Settings
     // Bit used to Set Which one of the 2 quests you are on
     set $@xmas_side_bit, (1 << 31);
@@ -265,11 +262,6 @@ L_Main:
     set $@xmas_spawn_y2, 89;
     set $@xmas_respawn_count, 9;
 
-    if($@xmas_debug == $@xmas_event_time)
-        goto L_EventTime;
-    if($@xmas_debug == $@xmas_reward_time)
-        goto L_RewardTime;
-
     if((gettime(6) == $@xmas_reward_start_month && gettime(5) >= $@xmas_reward_start_day 
             && (gettime(5) <= $@xmas_reward_end_day && $@xmas_reward_start_month == $@xmas_end_month
                 || !($@xmas_reward_start_month == $@xmas_end_month)))
@@ -297,9 +289,9 @@ L_RewardTime:
     goto L_Return;
 
 L_Return:
-    callfunc "ReplaceTrees";
     callfunc "SpawnMobs";
     callfunc "PresentHandler";
+    callfunc "ReplaceTrees";
     end;
 
 L_XmasError:
-- 
cgit v1.2.3-60-g2f50