Prepare for the purge

1 files changed, 2 insertions, 240 deletions

diff --git a/world/map/npc/functions/clear_vars.txt b/world/map/npc/functions/clear_vars.txt
index 2abfb118..00173429 100644
--- a/world/map/npc/functions/clear_vars.txt
+++ b/world/map/npc/functions/clear_vars.txt
@@ -14,205 +14,19 @@ function|script|ClearVariables
     callsub S_Heathin;
     callsub S_Remove_Skills;
     callsub S_FixBank;
-    callsub S_Angus;
     callsub S_Flags;
     callsub S_Bitmask;
     callsub S_BlueSage;
     callsub S_Luca;
 
-    callsub S_Easter;
-    callsub S_Easter2008;
-    callsub S_Easter2009;
-    callsub S_Easter2010;
-    callsub S_Easter2011;
-    callsub S_Easter2012;
-    callsub S_Halloween2006;
-    callsub S_Halloween2007;
-    callsub S_Halloween2008;
-    callsub S_Halloween2009;
-    callsub S_Halloween2010;
-    callsub S_Halloween2011;
-    callsub S_Halloween2016;
-    callsub S_Xmas2006;
-    callsub S_Xmas2007;
-    callsub S_Xmas2008;
-    callsub S_Xmas2009;
-    callsub S_Xmas2010;
-    callsub S_Xmas2011;
-    callsub S_Xmas2012;
     callsub S_Valentine2021;
 
-    callsub S_Misc;
     return; // go back to global handler
 
 S_Return: // this is to end execution of a sub
     return;
 
 ////////////////////////////////////////////////////////////////
-
-S_Xmas2007:
-    if(!QUEST_xmas07_state) goto S_Return;
-    set QUEST_xmas07_state, 0;
-    set QUEST_xmas07_milk, 0;
-    set QUEST_xmas07_cookies, 0;
-    set QUEST_xmas07_presents, 0;
-    return;
-
-S_Halloween2007:
-    set QUEST_Halloween07_state, 0;
-    return;
-
-S_Xmas2006:
-    if(!XMASQUEST1) goto S_Return;
-    set XMASQUEST1, 0;
-    set XMASQUEST2, 0;
-    set XMASQUEST3, 0;
-    set XMASQUEST4, 0;
-    set XMASQUEST5, 0;
-    set XMASQUEST6, 0;
-    set XMASQUEST7, 0;
-    set XMASQUEST8, 0;
-    set XMASQUEST9, 0;
-    set XMASQUEST10, 0;
-    set XMASQUEST11, 0;
-    set XMASQUEST12, 0;
-    set XMASQUEST13, 0;
-    set XMASQUEST14, 0;
-    set XMASQUEST15, 0;
-    set XMASQUEST16, 0;
-    set XMASQUEST17, 0;
-    set XMASQUEST18, 0;
-    set XMASQUEST19, 0;
-    set XMASQUEST20, 0;
-    return;
-
-S_Halloween2006:
-    if(!HWQUEST1) goto S_Return;
-    set HWQUEST1, 0;
-    set HWQUEST2, 0;
-    set HWQUEST3, 0;
-    set HWQUEST4, 0;
-    set HWQUEST5, 0;
-    set HWQUEST6, 0;
-    set HWQUEST7, 0;
-    set HWQUEST8, 0;
-    set HWQUEST9, 0;
-    set HWQUEST10, 0;
-    set HWQUEST11, 0;
-    set HWQUEST12, 0;
-    set HWQUEST13, 0;
-    set HWQUEST14, 0;
-    set HWQUEST15, 0;
-    set HWQUEST16, 0;
-    set HWQUEST17, 0;
-    set HWQUEST18, 0;
-    set HWQUEST18, 0;
-    set HWQUEST19, 0;
-    set HWQUEST20, 0;
-    return;
-
-S_Easter:
-    set EasterQuest, 0;
-    return;
-
-S_Easter2008:
-    set QUEST_Easter08_state, 0;
-    return;
-
-S_Halloween2008:
-    set Halloween08, 0;
-    return;
-
-S_Xmas2008:
-    set QUEST_xmas08_state, 0;
-    return;
-
-S_Easter2009:
-    set QUEST_Easter09, 0;
-    set QUEST_Easter09_slots, 0;
-    return;
-
-S_Halloween2009:
-    set Candyman, 0;
-    return;
-
-S_Xmas2009:
-    set QUEST_Christmas09_state, 0;
-    return;
-
-S_Easter2010:
-    if(!Easter_2010_QuestState) goto S_Return;
-    set Easter_2010_QuestState, 0;
-    set Easter_2010_EggState1, 0;
-    set Easter_2010_EggState2, 0;
-    set Easter_2010_EggState3, 0;
-    set Easter_2010_EggState4, 0;
-    set Easter_2010_EggState5, 0;
-    return;
-
-S_Halloween2010:
-    if(!hween10) goto S_Return;
-    set hween10, 0;
-    set hween10_collect_canpump, 0;
-    set hween10_credits, 0;
-    set hween10_collect, 0;
-    set hween10_collect_mmallow, 0;
-    set hween10_collect_jelskul, 0;
-    set hween10_bonecount, 0;
-    set hween10_collect_tondel, 0;
-    set hween10_paid, 0;
-    return;
-
-S_Halloween2016:
-    set HWEEN16, 0;
-    if(!hween16) goto S_Return;
-    set hween16, 0;
-    set hween16_collect_canpump, 0;
-    set hween16_credits, 0;
-    set hween16_collect, 0;
-    set hween16_collect_mmallow, 0;
-    set hween16_collect_jelskul, 0;
-    set hween16_bonecount, 0;
-    set hween16_collect_tondel, 0;
-    set hween16_paid, 0;
-    return;
-
-S_Xmas2010:
-    if(!Xmas2010) goto S_Return;
-    set Count_Yellow, 0;
-    set Count_White, 0;
-    set Maze, 0;
-    set Yellow, 0;
-    set White, 0;
-    set Xmas2010, 0;
-    set Golbenez_Inn_Cost, 0;
-    return;
-
-S_Easter2011:
-    set QUEST_Easter11, 0;
-    return;
-
-S_Halloween2011:
-    set hw2011, 0;
-    return;
-
-S_Xmas2011:
-    set xmas11, 0;
-    return;
-
-S_Easter2012:
-    set QUEST_Easter12, 0;
-    return;
-
-S_Xmas2012:
-    set xmas2012, 0;
-    return;
-
-S_Angus:
-    set QUEST_clothdyer_angus, 0;
-    set QUEST_clothdyer_state, 0;
-    return;
-
 S_Bitmask:
     // move Scythe quest into bitmasked variable QUEST_Hurnscald
     if (QUEST_Scythe_state)
@@ -309,21 +123,9 @@ S_Remove_Skills:
     setskill SKILL_EMOTE, 0;
     return;
 
-S_Misc:
-    set Death_Kill, 0;
-    set Scorp, 0; // Tulimshar and Mine Variables which aren't used anymore
-    set Bugleg, 0; // Tulimshar and Mine Variables which aren't used anymore
-    set KatzeBeenOutside, 0; // variable was moved to a temporary player variable
-    set LastHiss, 0; // variable was moved to Nibble 1 of the variable Katze
-    set CaveSnakeLamp, 0; // quest was turned into a Daily Quest, so the variable isn't needed anymore
-    set MAGIC_CAST_TICK, 0; // legacy stuff
-    return;
-
 S_Tutorial:
-    if(!TUTORIAL && !sorfina) goto S_Return;
+    if(!TUTORIAL) goto S_Return;
     //TUTORIAL to STARTAREA
-    if ((sorfina) || (kaan) || (hasan) || (tanisha))
-        goto S_ResetAllTut;
     set @tutorial_tmp, ((TUTORIAL & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
     // Tutorial
     // Nibble 0 (sorfina, tanisha, kaan & hasan)
@@ -363,15 +165,6 @@ S_Tutorial:
     set TUTORIAL, 0;
     return;
 
-S_ResetAllTut:
-    set sorfina, 0;
-    set tanisha, 0;
-    set hasan, 0;
-    set kaan, 0;
-    set TUTORIAL, 0;
-    set STARTAREA, 0;
-    set FLAGS, FLAGS &~ FLAG_TUTORIAL_DONE;
-    return;
 
 S_Heathin:
     if(!HEATHIN_QUEST) goto S_Return;
@@ -438,6 +231,7 @@ L_Deprecated:
 function|script|ClearGlobalVars
 {
     goto L_IlliaClear;
+
 // Clear the array which saves the teams who beat the Illia quest
 L_IlliaClear:
     set $@loop, 0;
@@ -454,37 +248,5 @@ L_IlliaLoop:
 
 L_EventClear:
     set $@loop, 0;
-
-// Clear global variable used in the Halloween event 2009
-    set $CandyOpsComplete, 0;
-
-// Clear global variables used in the Easter event 2010
-    set $Easter_2010_Npc_State1, 0;
-    set $Easter_2010_Npc_State2, 0;
-    set $Easter_2010_Egg_Loc_State1, 0;
-    set $Easter_2010_Egg_Loc_State2, 0;
-    set $Easter_2010_Egg_Loc_State3, 0;
-    set $Easter_2010_Egg_Loc_State4, 0;
-    set $Easter_2010_Egg_Loc_State5, 0;
-
-// Clear global variables used in the Halloween event 2010
-    set $hween10, 0;
-    set $hween10_tondel, 0;
-    set $hween10_mmallow, 0;
-    set $hween10_jelskul, 0;
-    set $hween10_canpump, 0;
-
-// Clear global variable used in Christmas event 2010
-    set $Golbenez_Inn_Cost, 0;
-
-// Clear global variables used in the Halloween event 2016
-    set $hween16, 0;
-    set $hween16_tondel, 0;
-    set $hween16_mmallow, 0;
-    set $hween16_jelskul, 0;
-    set $hween16_canpump, 0;
-
-// Variable was used in Voltain's script, was renamed and turned into a temporary variable
-    set $state, 0;
     return;
 }