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/009-2/kfahr.txt | 9 ---------
 world/map/npc/009-2/nurse.txt | 9 ---------
 2 files changed, 18 deletions(-)

(limited to 'world/map/npc/009-2')

diff --git a/world/map/npc/009-2/kfahr.txt b/world/map/npc/009-2/kfahr.txt
index 0b82d06a..6a34e959 100644
--- a/world/map/npc/009-2/kfahr.txt
+++ b/world/map/npc/009-2/kfahr.txt
@@ -15,11 +15,6 @@
 
 009-2.gat,67,57,0|script|Kfahr|125,
 {
-    set @hw2011_npc_id, $@hw2011_npc_kfahr;
-    if (gettime(7) == $@hw2011_year && gettime(6) == 10 && gettime(5) >= $@hw2011_start_day)
-        goto L_TrickOrTreat;
-
-L_Begin:
     set @QS_NEWBIE, 0;
     set @QS_MET_KFAHR, 1;
     set @QS_KNOWS_KFAHR, 2;
@@ -1083,8 +1078,4 @@ L_end:
 L_Update_Var:
     set QUEST_Forestbow_state, (QUEST_Forestbow_state & ~(@Q_MASK) | (@Q_status << @Q_SHIFT));
     return;
-
-L_TrickOrTreat:
-    callfunc "TrickOrTreat2011";
-    goto L_Begin;
 }
diff --git a/world/map/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt
index 5249819d..838d0ee2 100644
--- a/world/map/npc/009-2/nurse.txt
+++ b/world/map/npc/009-2/nurse.txt
@@ -24,11 +24,6 @@
 //######################################################################################
 009-2.gat,147,65,0|script|Nurse|119,
 {
-    set @hw2011_npc_id, $@hw2011_npc_nurse;
-    if (gettime(7) == $@hw2011_year && gettime(6) == 10 && gettime(5) >= $@hw2011_start_day)
-        goto L_TrickOrTreat;
-
-L_Begin:
     callfunc "ClearVariables";
 
     set @SNAKET_AMOUNT, 5;
@@ -549,8 +544,4 @@ L_Game_toomuch:
     mes "[Nurse]";
     mes "\"This would be way too much for my scale. I don't want to break it.\"";
     goto L_choosePut;
-
-L_TrickOrTreat:
-    callfunc "TrickOrTreat2011";
-    goto L_Begin;
 }
-- 
cgit v1.2.3-60-g2f50