From 045622fa6e515cf403ec710420746a15bcb75562 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Thu, 30 Jan 2014 17:19:55 -0800
Subject: Remove disabled magic and old holiday quests

---
 world/map/npc/021-1/eurni.txt   | 9 ---------
 world/map/npc/021-1/inac.txt    | 9 ---------
 world/map/npc/021-1/weellos.txt | 9 ---------
 3 files changed, 27 deletions(-)

(limited to 'world/map/npc/021-1')

diff --git a/world/map/npc/021-1/eurni.txt b/world/map/npc/021-1/eurni.txt
index 0170c6b6..8659c6cd 100644
--- a/world/map/npc/021-1/eurni.txt
+++ b/world/map/npc/021-1/eurni.txt
@@ -2,11 +2,6 @@
 
 021-1.gat,141,113,0|script|Eurni|136,
 {
-    set @hw2011_npc_id, $@hw2011_npc_eurni;
-    if (gettime(7) == $@hw2011_year && gettime(6) == 10 && gettime(5) >= $@hw2011_start_day)
-        goto L_TrickOrTreat;
-
-L_Begin:
     if (BaseLevel < 10) goto L_TooYoung;
     if (Zeny < 10000) goto L_NoMoney;
 
@@ -42,8 +37,4 @@ L_NoMoney:
     mes "[Eurni the Surgeon]";
     mes "\"You don't have enough to pay for my services.\"";
     close;
-
-L_TrickOrTreat:
-    callfunc "TrickOrTreat2011";
-    goto L_Begin;
 }
diff --git a/world/map/npc/021-1/inac.txt b/world/map/npc/021-1/inac.txt
index b5b8fa45..75cd0451 100644
--- a/world/map/npc/021-1/inac.txt
+++ b/world/map/npc/021-1/inac.txt
@@ -2,11 +2,6 @@
 
 021-1.gat,53,103,0|script|Inac|156,
 {
-    set @hw2011_npc_id, $@hw2011_npc_inac;
-    if (gettime(7) == $@hw2011_year && gettime(6) == 10 && gettime(5) >= $@hw2011_start_day)
-        goto L_TrickOrTreat;
-
-L_Begin:
     mes "[Inac]";
     mes "\"This cities water system is amazing. It was built centuries ago after the cataclysm that turned Tonori into this desert.\"";
     next;
@@ -16,8 +11,4 @@ L_Begin:
     mes "[Inac]";
     mes "\"They also say monsters have moved into the underground tunnels that bring and distribute water.\"";
     close;
-
-L_TrickOrTreat:
-    callfunc "TrickOrTreat2011";
-    goto L_Begin;
 }
diff --git a/world/map/npc/021-1/weellos.txt b/world/map/npc/021-1/weellos.txt
index b3321eb4..98565f9e 100644
--- a/world/map/npc/021-1/weellos.txt
+++ b/world/map/npc/021-1/weellos.txt
@@ -6,11 +6,6 @@
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowWeellosNT;
     set @kylian, ((QUEST_NorthTulimshar & $@businessmanNT_MASK) >> $@businessmanNT_SHIFT);
 
-    set @hw2011_npc_id, $@hw2011_npc_weellos;
-    if (gettime(7) == $@hw2011_year && gettime(6) == 10 && gettime(5) >= $@hw2011_start_day)
-        goto L_TrickOrTreat;
-
-L_Begin:
     if isin("021-1.gat", 130, 120, 140, 125) goto L_In;
 
     mes "[Weellos]";
@@ -33,8 +28,4 @@ L_BeforeClose:
 L_Close:
     set @kylian, 0;
     close;
-
-L_TrickOrTreat:
-    callfunc "TrickOrTreat2011";
-    goto L_Begin;
 }
-- 
cgit v1.2.3-60-g2f50