Halloween Annual Base Commit

3 files changed, 3 insertions, 131 deletions

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:
diff --git a/world/map/npc/annuals/xmas/debug.txt b/world/map/npc/annuals/xmas/debug.txt
index 38bbdf15..a26565b6 100644
--- a/world/map/npc/annuals/xmas/debug.txt
+++ b/world/map/npc/annuals/xmas/debug.txt
@@ -227,27 +227,14 @@ L_End:
     end;
 }
 
-
-017-9.gat,31,24,0|script|XmasDebug#5|105,
-{
-    if(getgmlevel() < 40)
-        goto L_End;
-
-    callfunc "XmasDebug";
-    goto L_End;
-
-L_End:
-    end;
-}
-
-020-1.gat,86,76,0|script|XmasDebug#6|105,
+020-1.gat,86,76,0|script|XmasDebug#5|105,
 {
     callfunc "XmasDebug";
     goto L_End;
 
 OnInit:
     if(!(debug))
-        disablenpc "XmasDebug#6";
+        disablenpc "XmasDebug#5";
     goto L_End;
 
 L_End:
diff --git a/world/map/npc/annuals/xmas/tree_beard.txt b/world/map/npc/annuals/xmas/tree_beard.txt
deleted file mode 100644
index d7e8b183..00000000
--- a/world/map/npc/annuals/xmas/tree_beard.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-// Annual Xmas Environment changes
-020-1.gat,90,78,0|script|#Tree|380,
-{
-    end;
-}
-
-020-1.gat,90,78,0|script|#XmasTree|379,
-{
-    end;
-}
-
-020-1.gat,90,79,0|script|Present#1|386,
-{
-    callfunc "XmasStates";
-    callfunc "XmasMainItemReward";
-    close;
-}
-
-009-1.gat,54,38,0|script|#TreeNoSnow|394,
-{
-    end;
-}
-
-009-1.gat,54,38,0|script|#XmasTreeNoSnow|381,
-{
-    end;
-}
-
-009-1.gat,54,39,0|script|Present#2|386,
-{
-    callfunc "XmasStates";
-    callfunc "XmasMainItemReward";
-    close;
-}
-
-001-1.gat,41,45,0|script|#PalmTree|384,
-{
-    end;
-}
-
-001-1.gat,41,46,0|script|Present#3|386,
-{
-    callfunc "XmasStates";
-    callfunc "XmasMainItemReward";
-    close;
-}
-
-001-1.gat,41,45,0|script|#XmasPalmTree|383,
-{
-    end;
-}
-
-function|script|SpawnMobs|,
-{
-    cmdothernpc "XmasSpawnManager", "SpawnStart";
-    return;
-}
-
-function|script|PresentHandler|,
-{
-    if($@xmas_time == $@xmas_reward_time)
-        goto L_DeliverPresents;
-    goto L_DisablePresents;
-
-L_DeliverPresents:
-    enablenpc "Present#1";
-    enablenpc "Present#2";
-    enablenpc "Present#3";
-    goto L_Return;
-
-L_DisablePresents:
-    disablenpc "Present#1";
-    disablenpc "Present#2";
-    disablenpc "Present#3";
-    goto L_Return;
-
-L_Return:
-    return;
-}
-
-function|script|ReplaceTrees|,
-{
-    if($@xmas_time)
-        goto L_XmasTree;
-    goto L_Tree;
-
-L_XmasTree:
-    disablenpc "#Tree";
-    enablenpc "#XmasTree";
-    disablenpc "#TreeNoSnow";
-    enablenpc "#XmasTreeNoSnow";
-    disablenpc "#PalmTree";
-    enablenpc "#XmasPalmTree";
-    goto L_Return;
-
-L_Tree:
-    disablenpc "#XmasTree";
-    enablenpc "#Tree";
-    disablenpc "#XmasTreeNoSnow";
-    enablenpc "#TreeNoSnow";
-    disablenpc "#XmasPalmTree";
-    enablenpc "#PalmTree";
-    goto L_Return;
-
-L_Return:
-    return;
-}