Remove disabled magic and old holiday quests

19 files changed, 0 insertions, 4625 deletions

diff --git a/world/map/npc/easter/2008/monsters.txt b/world/map/npc/easter/2008/monsters.txt
deleted file mode 100644
index d886f519..00000000
--- a/world/map/npc/easter/2008/monsters.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-002-2.gat,0,0,0,0     monster EasterFluffy      1027,1,0,0,0
-002-3.gat,0,0,0,0     monster EasterFluffy      1027,1,0,0,0
-001-1.gat,0,0,0,0     monster EasterFluffy      1027,1,0,0,0
-002-4.gat,0,0,0,0     monster EasterFluffy      1027,1,0,0,0
-005-1.gat,0,0,0,0     monster EasterFluffy      1027,1,0,0,0
-011-1.gat,0,0,0,0     monster EasterFluffy      1027,1,0,0,0
-019-1.gat,0,0,0,0    monster EasterFluffy      1027,1,0,0,0
-020-3.gat,0,0,0,0    monster EasterFluffy      1027,1,0,0,0
-010-2.gat,0,0,0,0    monster EasterFluffy      1027,1,0,0,0
-003-1.gat,0,0,0,0    monster EasterFluffy      1027,1,0,0,0
-007-1.gat,0,0,0,0    monster EasterFluffy      1027,1,0,0,0
-011-4.gat,0,0,0,0    monster EasterFluffy      1027,1,0,0,0
-008-1.gat,0,0,0,0    monster EasterFluffy      1027,1,0,0,0
-010-2.gat,0,0,0,0    monster EasterFluffy      1027,1,0,0,0
-05-3.gat,0,0,0,0    monster EasterFluffy      1027,1,0,0,0
\ No newline at end of file
diff --git a/world/map/npc/easter/2008/npc.txt b/world/map/npc/easter/2008/npc.txt
deleted file mode 100644
index abc422d4..00000000
--- a/world/map/npc/easter/2008/npc.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-001-1.gat,40,40,6	script	EasterBunny	139,{
-	if (QUEST_Easter08_state > 0) goto L_Finished;
-
-	mes "[Easter Bunny]";
-	mes "Hi handsome! Happy Easter to you.";
-	next;
-
-	set @cond, 0;
-	if (countitem("RedEasterEgg") > 0) set @cond, @cond + 1;
-        if (countitem("GreenEasterEgg") > 0) set @cond, @cond + 1;
-        if (countitem("BlueEasterEgg") > 0) set @cond, @cond + 1;
-        if (countitem("YellowEasterEgg") > 0) set @cond, @cond + 1;
-        if (countitem("PinkEasterEgg") > 0) set @cond, @cond + 1;
-        if (countitem("TealEasterEgg") > 0) set @cond, @cond + 1;
-
-        if (@cond == 6) goto L_Give;
-
-	L_Message:
-                mes "[Easter Bunny]";
-                mes "Do you want to take part in the big easter egg hunt?";
-                mes "";
-                mes "There are fluffys all around the world with their magic easter eggs.";
-                mes "When you catch them and collect 6 different kinds of eggs I will";
-                mes "give you a special prize!";
-                if (@cond > 0) mes "You already have found "+@cond+" different eggs!";
-                close;
-
-        L_Give:
-	        delitem "RedEasterEgg", 1;
-	        delitem "GreenEasterEgg", 1;
-	        delitem "BlueEasterEgg", 1;
-	        delitem "YellowEasterEgg", 1;
-	        delitem "PinkEasterEgg", 1;
-	        delitem "TealEasterEgg", 1;
-                mes "[Easter Bunny]";
-        	mes "Here is your prize:";
-        	mes "The official easter 2008 headgear!";
-        	mes "Have fun!";
-		getitem "BunnyEars", 1;
-        	set QUEST_Easter08_state, 1;
-        	close;
-
-	L_Finished:
-                mes "[Easter Bunny]";
-		mes "You already completed the quest.";
-		mes "But maybe you would like to help others complete it, too?";
-		close;
-
-}
diff --git a/world/map/npc/easter/2009/bunny.txt b/world/map/npc/easter/2009/bunny.txt
deleted file mode 100644
index 62644f23..00000000
--- a/world/map/npc/easter/2009/bunny.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-// The Easter Bunny
-
-007-1.gat,32,30, 0	script	Easter Bunny	173,{
-	callfunc "ClearVariables";
-	if (QUEST_Easter09 == 1) goto L_CheckEggs;
-	if (QUEST_Easter09 == 2) goto L_Done;
-	
-	mes "[Easter Bunny]";
-	mes "Oh dear! Oh dear! I shall be too late!";
-	next;
-	
-	menu
-		"What do you mean?", -,
-		"Goodbye then.", close;
-	
-	mes "[Easter Bunny]";
-	mes "It's already Easter and I haven't hid a single Easter egg yet. And the worst part is, they already started searching for the eggs. What am I going to do? I seriously need a miracle. I mean, there are so many people searching and I haven't even begun yet. What am I going to do?";
-	next;
-	
-	menu
-		"Maybe I can help.", -,
-		"I'll leave you to it then.", close;
-	
-	mes "[Easter Bunny]";
-	mes "It's hopeless, you can't help me, it's to late!";
-	next;
-	
-	menu
-		"I'm sure they haven't searched everywhere. What about that stone over there?", -,
-		"You're probably right.", close;
-	
-	mes "[Easter Bunny]";
-	mes "Maybe you're right. Here, go hide these 10 Easter eggs for me.";
-	
-	getitem "EasterEgg", 10;
-	set QUEST_Easter09, 1;
-	
-	close;
-	
-L_CheckEggs:
-	set @count, 0;
-	set @temp, QUEST_Easter09_slots;
-	set @i, 0;
-	
-L_CheckEggs_Loop:
-	if (@temp & 1) set @count, @count + 1;
-	set @i, @i + 1;
-	if (@i == 31) goto L_CheckEggs_Continue;
-	set @temp, @temp >> 1;
-	goto L_CheckEggs_Loop;
-	
-L_CheckEggs_Continue:
-	if (@count > 10) goto L_ManyEggs;
-	if (@count == 10) goto L_EnoughEggs;
-	mes "[Easter Bunny]";
-	mes "Please place " + (10 - @count) + " more eggs!";
-	
-	set @temp, 10 - @count - countitem("EasterEgg");
-	
-	if (@temp > 0) goto L_GiveMoreEggs;
-	close;
-	
-L_GiveMoreEggs:
-	mes "[Easter Bunny]";
-	mes "What happened to " + @temp + " of your eggs?";
-	next;
-	
-	mes "[Easter Bunny]";
-	mes "Never mind that. Take these and get them placed!";
-	getitem "EasterEgg", @temp;
-	close;
-	
-L_ManyEggs:
-	mes "[Easter Bunny]";
-	mes "How did you manage to place more eggs than I gave you?";
-	next;
-	
-L_EnoughEggs:
-	mes "[Easter Bunny]";
-	mes "Thanks! I'm saved. Now I don't need to be scared anymore. And I just came with the great plan to hide myself under a paper bag. Oh well, maybe you can use it.";
-	getitem "PaperBagHelm", 1;
-	set QUEST_Easter09, 2;
-	close;
-	
-L_Done:
-	mes "[Easter Bunny]";
-	mes "Thank you for placing those eggs for me!";
-	close;
-}
diff --git a/world/map/npc/easter/2009/object.txt b/world/map/npc/easter/2009/object.txt
deleted file mode 100644
index 263321aa..00000000
--- a/world/map/npc/easter/2009/object.txt
+++ /dev/null
@@ -1,407 +0,0 @@
-//
-
-function	script	Easter2009Object	{
-	if (@action == 1) goto L_TryPlace;
-	
-	set @result, $Easter2009 >> @object;
-	set @result, @result & 1;
-	
-	if (@result == 1) goto L_GiveEgg;
-	return;
-	
-L_GiveEgg:
-	set $Easter2009, $Easter2009 & ~(1 << @object);
-	getitem "EasterEgg", 1;
-	return;
-	
-L_TryPlace:
-	set @has, QUEST_Easter09_slots >> @object;
-	set @has, @has & 1;
-	
-	if (@has == 1) goto L_AlreadyPlaced;
-	
-	set @has, $Easter2009 >> @object;
-	set @has, @has & 1;
-	
-	if (@has == 0) goto L_DoPlace;
-	set @result, 0;
-	return;
-	
-L_DoPlace:
-	if (countitem("EasterEgg") > 0) goto L_DoPlace_Finish;
-	
-	mes "You don't have any eggs to place!";
-	close;
-	
-L_DoPlace_Finish:
-	delitem "EasterEgg", 1;
-	set @has, 1 << @object;
-	set QUEST_Easter09_slots, QUEST_Easter09_slots | @has;
-	set $Easter2009, $Easter2009 | @has;
-	set @result, 1;
-	return;
-	
-L_AlreadyPlaced:
-	set @result, 2;
-	return;
-}
-
-function	script	Easter2009Rock	{
-	if (QUEST_Easter09 == 1) goto L_PlaceEgg;
-	mes "Do you want to examine this rock?";
-	next;
-	menu
-		"Yes", -,
-		"No", close;
-	
-	set @action, 0;
-	callfunc "Easter2009Object";
-	if (@result == 1) goto L_Found;
-	mes "There is nothing strange about this rock.";
-	close;
-	
-L_Found:
-	mes "You found an egg under the rock.";
-	close;
-	
-L_PlaceEgg:
-	mes "Do you want to put an egg under this rock?";
-	next;
-	menu
-		"Yes", -,
-		"No", close;
-	
-	set @action, 1;
-	callfunc "Easter2009Object";
-	if (@result == 1) goto L_Placed;
-	if (@result == 2) goto L_AlreadyPlaced;
-	mes "Strange, there is already an egg under this rock.";
-	close;
-	
-L_Placed:
-	mes "You placed an egg under the rock.";
-	close;
-	
-L_AlreadyPlaced:
-	mes "You already placed an egg under this rock!";
-	close;
-}
-
-function	script	Easter2009Tree	{
-	if (QUEST_Easter09 == 1) goto L_PlaceEgg;
-	mes "Do you want to examine this tree?";
-	next;
-	menu
-		"Yes", -,
-		"No", close;
-	
-	set @action, 0;
-	callfunc "Easter2009Object";
-	if (@result == 1) goto L_Found;
-	mes "There is nothing strange about this tree.";
-	close;
-	
-L_Found:
-	mes "You found an egg in the tree.";
-	close;
-	
-L_PlaceEgg:
-	mes "Do you want to put an egg in this tree?";
-	next;
-	menu
-		"Yes", -,
-		"No", close;
-	
-	set @action, 1;
-	callfunc "Easter2009Object";
-	if (@result == 1) goto L_Placed;
-	if (@result == 2) goto L_AlreadyPlaced;
-	mes "Strange, there is already an egg in this tree.";
-	close;
-	
-L_Placed:
-	mes "You placed an egg in the tree.";
-	close;
-	
-L_AlreadyPlaced:
-	mes "You already placed an egg in this tree!";
-	close;
-}
-
-function	script	Easter2009Flower	{
-	if (QUEST_Easter09 == 1) goto L_PlaceEgg;
-	mes "Do you want to examine these flowers?";
-	next;
-	menu
-		"Yes", -,
-		"No", close;
-	
-	set @action, 0;
-	callfunc "Easter2009Object";
-	if (@result == 1) goto L_Found;
-	mes "There is nothing strange about these flowers.";
-	close;
-	
-L_Found:
-	mes "You found an egg among the flowers.";
-	close;
-	
-L_PlaceEgg:
-	mes "Do you want to hide an egg with these flowers?";
-	next;
-	menu
-		"Yes", -,
-		"No", close;
-	
-	set @action, 1;
-	callfunc "Easter2009Object";
-	if (@result == 1) goto L_Placed;
-	if (@result == 2) goto L_AlreadyPlaced;
-	mes "Strange, there is already an egg here.";
-	close;
-	
-L_Placed:
-	mes "You placed an egg with the flowers.";
-	close;
-	
-L_AlreadyPlaced:
-	mes "You already placed an egg among these flowers!";
-	close;
-}
-
-function	script	Easter2009Pot	{
-	if (QUEST_Easter09 == 1) goto L_PlaceEgg;
-	mes "Do you want to examine this pot?";
-	next;
-	menu
-		"Yes", -,
-		"No", close;
-	
-	set @action, 0;
-	callfunc "Easter2009Object";
-	if (@result == 1) goto L_Found;
-	mes "There is nothing strange about this pot.";
-	close;
-	
-L_Found:
-	mes "You found an egg in the pot.";
-	close;
-	
-L_PlaceEgg:
-	mes "Do you want to put an egg in this pot?";
-	next;
-	menu
-		"Yes", -,
-		"No", close;
-	
-	set @action, 1;
-	callfunc "Easter2009Object";
-	if (@result == 1) goto L_Placed;
-	if (@result == 2) goto L_AlreadyPlaced;
-	mes "Strange, there is already an egg in this pot.";
-	close;
-	
-L_Placed:
-	mes "You placed an egg in the pot.";
-	close;
-	
-L_AlreadyPlaced:
-	mes "You already placed an egg in this pot!";
-	close;
-}
-
-function	script	Easter2009Sign	{
-	if (QUEST_Easter09 == 1) goto L_PlaceEgg;
-	mes "Do you want to examine this sign?";
-	next;
-	menu
-		"Yes", -,
-		"No", close;
-	
-	set @action, 0;
-	callfunc "Easter2009Object";
-	if (@result == 1) goto L_Found;
-	mes "There is nothing strange about this sign.";
-	close;
-	
-L_Found:
-	mes "You found an egg near the sign.";
-	close;
-	
-L_PlaceEgg:
-	mes "Do you want to put an egg near this sign?";
-	next;
-	menu
-		"Yes", -,
-		"No", close;
-	
-	set @action, 1;
-	callfunc "Easter2009Object";
-	if (@result == 1) goto L_Placed;
-	if (@result == 2) goto L_AlreadyPlaced;
-	mes "Strange, there is already an egg near this sign.";
-	close;
-	
-L_Placed:
-	mes "You placed an egg near the sign.";
-	close;
-	
-L_AlreadyPlaced:
-	mes "You already placed an egg near this sign!";
-	close;
-}
-
-007-1.gat,126,63,0	script	Rock	127,{
-	set @object, 0;
-	callfunc "Easter2009Rock";
-}
-
-009-1.gat,66,33,0	script	Pot	127,{
-	set @object, 1;
-	callfunc "Easter2009Pot";
-}
-
-009-1.gat,93,52,0	script	Tree	127,{
-	set @object, 2;
-	callfunc "Easter2009Tree";
-}
-
-007-1.gat,37,22,0	script	Flowers	127,{
-	set @object, 3;
-	callfunc "Easter2009Flower";
-}
-
-008-1.gat,38,32,0	script	Tree	127,{
-	set @object, 4;
-	callfunc "Easter2009Tree";
-}
-
-008-1.gat,43,21,0	script	Flowers	127,{
-	set @object, 5;
-	callfunc "Easter2009Flower";
-}
-
-018-1.gat,121,88,0	script	Tree	127,{
-	set @object, 6;
-	callfunc "Easter2009Tree";
-}
-
-010-1.gat,103,73,0	script	Flowers	127,{
-	set @object, 7;
-	callfunc "Easter2009Flower";
-}
-
-010-1.gat,31,45,0	script	Rock	127,{
-	set @object, 8;
-	callfunc "Easter2009Rock";
-}
-
-011-1.gat,83,39,0	script	Pot	127,{
-	set @object, 9;
-	callfunc "Easter2009Pot";
-}
-
-011-1.gat,33,78,0	script	Tree	127,{
-	set @object, 10;
-	callfunc "Easter2009Tree";
-}
-
-018-1.gat,64,98,0	script	Rock	127,{
-	set @object, 11;
-	callfunc "Easter2009Rock";
-}
-
-012-1.gat,88,122,0	script	Flowers	127,{
-	set @object, 12;
-	callfunc "Easter2009Flower";
-}
-
-012-1.gat,97,32,0	script	Rock	127,{
-	set @object, 13;
-	callfunc "Easter2009Rock";
-}
-
-012-1.gat,153,101,0	script	Tree	127,{
-	set @object, 14;
-	callfunc "Easter2009Tree";
-}
-
-013-1.gat,118,92,0	script	Rock	127,{
-	set @object, 15;
-	callfunc "Easter2009Rock";
-}
-
-013-1.gat,104,36,0	script	Flowers	127,{
-	set @object, 16;
-	callfunc "Easter2009Flower";
-}
-
-014-1.gat,100,37,0	script	Flowers	127,{
-	set @object, 17;
-	callfunc "Easter2009Flower";
-}
-
-014-1.gat,38,102,0	script	Tree	127,{
-	set @object, 18;
-	callfunc "Easter2009Tree";
-}
-
-014-1.gat,54,50,0	script	Sign	127,{
-	set @object, 19;
-	callfunc "Easter2009Sign";
-}
-
-015-1.gat,59,97,0	script	Rock	127,{
-	set @object, 20;
-	callfunc "Easter2009Rock";
-}
-
-015-1.gat,29,25,0	script	Flowers	127,{
-	set @object, 21;
-	callfunc "Easter2009Flower";
-}
-
-016-1.gat,83,54,0	script	Pot	127,{
-	set @object, 22;
-	callfunc "Easter2009Pot";
-}
-
-016-1.gat,62,83,0	script	Sign	127,{
-	set @object, 23;
-	callfunc "Easter2009Sign";
-}
-
-016-1.gat,20,51,0	script	Tree	127,{
-	set @object, 24;
-	callfunc "Easter2009Tree";
-}
-
-017-1.gat,77,32,0	script	Sign	127,{
-	set @object, 25;
-	callfunc "Easter2009Sign";
-}
-
-017-1.gat,104,90,0	script	Tree	127,{
-	set @object, 26;
-	callfunc "Easter2009Tree";
-}
-
-017-1.gat,37,76,0	script	Flowers	127,{
-	set @object, 27;
-	callfunc "Easter2009Flower";
-}
-
-009-1.gat,29,48,0	script	Flowers	127,{
-	set @object, 28;
-	callfunc "Easter2009Flower";
-}
-
-010-1.gat,127,99,0	script	Tree	127,{
-	set @object, 29;
-	callfunc "Easter2009Tree";
-}
-
-011-1.gat,34,95,0	script	Rock	127,{
-	set @object, 30;
-	callfunc "Easter2009Rock";
-}
diff --git a/world/map/npc/easter/2010/Blocker.txt b/world/map/npc/easter/2010/Blocker.txt
deleted file mode 100644
index 491180a7..00000000
--- a/world/map/npc/easter/2010/Blocker.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-028-1.gat,120,124,0	script	#28Barrier#_M	127,1,1{
-    end;
-OnTouch:
-    if (($Easter_2010_Npc_State2 >> E10_BARRIER_SHIFT) & E10_BARRIER_MASK == E10_BARRIER_ACTIVE) goto L_block;
-
-    warp "028-3.gat", 33, 76;
-    end;
-
-L_block:
-    message strcharinfo(0), "There is some strange field around this opening. You cannot see any possible way to bypass it.";
-    end;
-
-}
diff --git a/world/map/npc/easter/2010/Doctor.txt b/world/map/npc/easter/2010/Doctor.txt
deleted file mode 100644
index fefd9814..00000000
--- a/world/map/npc/easter/2010/Doctor.txt
+++ /dev/null
@@ -1,509 +0,0 @@
-// Doctor 1, at the big tree.
-
-028-1.gat,27,108,0	script	Doctor#who1	184,{
-    // States here
-    callsub S_Helped_Count;
-    if (@Easter_2010_helper >= 2 && !((Easter_2010_QuestState >> E10_FLAG_MID_REWARD_SHIFT) & E10_FLAG_MID_REWARD_MASK))
-        goto L_MidReward;
-    if (@Easter_2010_helper == 4 && !((Easter_2010_QuestState >> E10_FLAG_RETURN_READY_SHIFT) & E10_FLAG_RETURN_READY_MASK))
-        goto L_Defeat_Invader;
-    if ((Easter_2010_QuestState >> E10_FLAG_RETURN_READY_SHIFT) & E10_FLAG_RETURN_READY_MASK == E10_FLAG_RETURN_READY && (Easter_2010_QuestState >> E10_STATE_ROSE_SHIFT) & E10_STATE_ROSE_MASK == E10_STATE_ROSE_ROSE_COMPLETE)
-        goto L_Return_Ready_Optional;
-
-// ======================
-// === First location ===
-// ======================
-
-L_At_Tree:
-    // Checks for if the player has already helped the doctor, either here or elsewhere, go here.
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_TREE_SHIFT) & E10_FLAG_HELPED_DOCTOR_TREE_MASK == E10_FLAG_HELPED_DOCTOR_TREE)
-        goto L_At_Tree_Helped;
-
-    if ((Easter_2010_QuestState >> E10_FLAG_KNOWS_DOCTOR_SHIFT) & E10_FLAG_KNOWS_DOCTOR_MASK == E10_FLAG_KNOWS_DOCTOR)
-        goto L_At_Tree_Knows_Doctor;
-    // Fallthrough, reaction to a player that is completely new.
-
-    setarray @responses$, "\"This tree, I'm sure it's - \"The man looks up distractedly.\" Oh, hello. Can't talk now, I'm afraid, this world needs my help...\"", "He looks up, confused. \"Withering... why is this world dying? Perhaps--er, who are you? You'll have to excuse me, I'm a little preoccupied with this tree...\"", "\"What-what? I mean, sorry, hello! Can't quite talk, a bit busy trying to save this world.\" He seems to be deep in thought, brandishing what looks to be a small tool near the tree.", "\"You there! Do you realise what's happening here? This world is dying, much like a human would, perhaps. Nevertheless...\""; // Not many responses are needed here, since init only happens one per player.
-    callsub S_Update_Knows;
-    next;
-    if (countitem("Lifestone") > 0)
-        goto L_has_lifestone;
-    close;
-
-L_At_Tree_Knows_Doctor:
-    // More responses than the initial here, and need to be more of a hint.
-    setarray @responses$, "\"I just don't know what's wrong. My analysis tells me this tree is important, but I don't seem to have the right tool...\"", "A distinct... whirring noise sounds from the device the Doctor wields. \"You see this tree? Right here, this one! There's something amiss here, perhaps beyond my expertise.\"", "\"Yes, yes, all evidence points to this tree. \"He leans in for a closer look. \"Brilliant! No! Um... that's not right.\"", "He withdraws what appear to be glasses from his pocket and puts them on, peering intently at the tree.", "\"Mm-hmm, yes! Do you see what's wrong with this tree? No?\" He sounds somewhat dejected, but still determined. \"Well, neither do I, I'm afraid.\"", "The Doctor turns with a look of panic on his face, gesturing for you to stop talking. He turns back to the tree, muttering \"some way to heal...\"";
-    callsub S_Dialogue_Knows;
-    next;
-
-    if (countitem("Lifestone") > 0)
-        goto L_has_lifestone;
-    mes "[Doctor]";
-    mes "";
-    mes "\"I'm trying to understand something, but it's got me quite confused, I'm afraid. I need something to assist me... something to counter the death...\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Unfortunately, I really can't think of anything to use. Please leave me alone while I think.\"";
-    next;
-    menu "Okay...", -,
-            "Actually, I just want to go home. Can you help?", L_Warning;
-    close;
-
-L_has_lifestone:
-    mes "[Doctor]";
-    mes "";
-    mes "\"I'm busy right now, I'm afraid I - what's that thing you've got there?\"";
-    next;
-    goto L_spotted_lifestone;
-
-L_spotted_lifestone:
-    menu
-            "That? That's just a Life Stone. Basic level one magic item.", L_want_lifestone,
-            "Sorry, I'm not interested in talking right now.", -;
-    close;
-
-L_want_lifestone:
-    mes "[Doctor]";
-    mes "";
-    mes "\"A Life Stone? It is not of this world... and it's just what I need! Where did you get it?\"";
-    next;
-    menu
-        "I made it myself!", L_made_lifestone,
-        "Elanore the Healer made it for me.", L_elanore_lifestone,
-        "I bought it off someone.", L_bought_lifestone,
-        "What? You expect me to remember where I get every single lifestone?", L_expect_lifestone;
-    close;
-
-L_made_lifestone:
-    mes "[Doctor]";
-    mes "";
-    mes "\"You made it? But then you... you must be from elsewhere as well! How did you get here?\"";
-    next;
-    menu
-        "A mysterious old woman gave me a flower, and then I appeared here.", L_woman_lifestone,
-        "I died.", L_dead_lifestone,
-        "I think I've told you enough for now...", -;
-    close;
-
-L_elanore_lifestone:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Elanore the Healer... I have not heard of her, but she must be a powerful being indeed. But there are more pressing matters - will you lend me this... 'Life Stone'?\"";
-    next;
-    menu
-        "Yeah, whatever.", L_offer_lifestone,
-        "I'm not giving you my stuff!", -;
-    close;
-
-L_bought_lifestone:
-    mes "[Doctor]";
-    mes "";
-    mes "\"And you could afford it? Something as powerful as this must be worth a fortune.\"";
-    next;
-    menu
-        "Actually, it was only 100 GP.", L_cheap_lifestone,
-        "Yeah, well, I got a few million in the bank.", L_rich_lifestone,
-        "Powerful? I thought it just did minor healing.", L_powerful_lifestone;
-    close;
-
-L_expect_lifestone:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Well, I suppose so. I need something like this, however... I must be sure it has not been tainted with darkness. If you don't remember where you got it, it's no use to me.\"";
-    close;
-
-L_woman_lifestone:
-    mes "[Doctor]";
-    mes "";
-    mes "\"An old woman gave you - ? Well, never mind that. This 'Life Stone'... I think I need it. Will you lend it to me?\"";
-    next;
-    menu
-        "Sure.", L_offer_lifestone,
-        "Sorry, I need it.", -;
-    close;
-
-L_dead_lifestone:
-    mes "[Doctor]";
-    mes "";
-    mes "\"So... you're dead? Then maybe this world is some kind of... afterlife to yours?\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"But if this world is dying, how can it be an afterlife? That doesn't make sense...\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Unless you were already dead, and you've been reincarnated...\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"But surely you wouldn't be able to make a powerful thing like this... this 'Life Stone' in a world for the dead?\"";
-    mes "\"But since you are here, and you do have this Life Stone - can I borrow it? I think I may need it, and quite soon.\"";
-    next;
-    menu
-        "Yes, take it.", L_offer_lifestone,
-        "No, I need it.", -;
-    close;
-
-L_cheap_lifestone:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Then that was a bargain, my friend. This must surely be worth thousands! And I'm afraid I'm going to have to ask you if I may borrow it.\"";
-    next;
-    menu
-        "Yeah, you can.", L_offer_lifestone,
-        "Nope, sorry.", -;
-    close;
-
-L_rich_lifestone:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Ah! I'm afraid I expected you to be poor... being the warrior type, I mean. Well... I'm going to need this Life Stone. It's quite important. Might I purchase it from you?\"";
-    next;
-    menu
-        "Indeed. That will be 50,000 GP, please.", L_expensive_lifestone,
-        "Better. You can have it for free!", L_offer_lifestone,
-        "No. It's mine.", -;
-    close;
-
-L_powerful_lifestone:
-    if (getskilllv(SKILL_MAGIC)) goto L_hasmagic_lifestone;
-    mes "[Doctor]";
-    mes "";
-    mes "\"It contains a strange power which I have never detected before... and I think I can use it. Can I borrow it off you?\"";
-    next;
-    menu
-        "Yeah, if you want.", L_offer_lifestone,
-        "Er... no. My powerful rock! Ha!", -;
-    close;
-
-L_hasmagic_lifestone:
-    mes "[Doctor]";
-    mes "";
-    mes "\"It contains a strange power which I have never detected before... except... in you. You have this power in you!\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Anyway... this stone, this Life Stone, can I borrow it?\"";
-    next;
-    menu
-        "Sure. Here you are.", L_offer_lifestone,
-        "Tell me more about this power.", L_power_lifestone,
-        "No.", -;
-    close;
-
-L_power_lifestone:
-    mes "[Doctor]";
-    mes "";
-    mes "\"There's nothing I can really tell you. I just know it's there, I don't know what it is. Can I borrow the Stone?\"";
-    next;
-    menu
-        "Yeah, sure.", L_offer_lifestone,
-        "No.", -;
-    close;
-
-L_help_lifestone:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Just the boost I needed... hm? No, that's all for now, thank you. Is there anything *you* need?\"";
-    next;
-    menu "I might have some questions later, if you'll be here...", -,
-         "Thank you for the offer, really, but I'm fine.", -;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Well, I'll still be gathering information myself, so perhaps we'll cross paths again.\"";
-    close;
-
-L_expensive_lifestone:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, excuse me. I'm not sure about your currency, but I don't think I can cover that right now. Please let me know if you change your mind.\"";
-    close;
-
-L_only_lifestone:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Yes... uh, well, I suppose if you wanted I could pay you for it. Let me see now...\"";
-    next;
-    mes "\"Here we are! It's all I've got on me at the moment, I'm afraid.\"";
-    getitem "StrangeCoin", 1;
-    next;
-    menu
-        "Is there anything else you need?", L_help_lifestone,
-        "Alright then. Bye!", -;
-    close;
-
-L_offer_lifestone:
-    if (countitem("Lifestone") < 1)
-        goto L_lost_lifestone;
-
-    delitem "Lifestone", 1;
-    callsub S_Update_Helped;
-
-    if (countitem("Lifestone") == 0)
-        goto L_one_lifestone;
-
-    mes "[Doctor]";
-    mes "";
-    mes "\"Wonderful! What a spot of luck it was you coming here with this. You don't know how much you deserve thanks.\"";
-    mes "He takes your lifestone and places it into a curious device, then waves the device up and down the tree. It makes a number of beeping sounds, and the Doctor seems happy.";
-    next;
-    goto L_given_lifestone;
-
-L_one_lifestone:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Wonderful! What a spot of luck it was you coming here with this. You don't know how much you deserve thanks.\"";
-    mes "He takes your lifestone and places it into a curious device, then waves the device up and down the tree. It makes a number of beeping sounds, and the Doctor seems happy.";
-    next;
-    menu
-        "Is there anything else you need?", L_help_lifestone,
-        "That was the only one I had, I'm glad it helped.", L_only_lifestone,
-        "Alright then. Bye!", -;
-    close;
-
-L_lost_lifestone:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Brilliant! Fantastic! This will surely help... Wait, I thought you had a lifestone for me? Well, maybe you can come by again when you do.\"";
-    close;
-
-L_given_lifestone:
-    menu
-        "Is there anything else you need?", L_help_lifestone,
-        "Alright then. Bye!", -;
-    close;
-
-L_At_Tree_Helped:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Fantastic! Your help with this tree is much appreciated. I believe we are that much closer to solving this mystery.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"I suspect there is still much to do. Please feel free to look around, there might be more information to gather elsewhere.\"";
-    next;
-    menu "Okay, I'll see you around!", -,
-            "Actually, I'd like to go home now. Any chance you could help?", L_Warning;
-    close;
-
-// ===================================================================
-// Helper portions, duplicated in each script for want of time, sorry.
-// ===================================================================
-
-// The player has defeated the invader and helped enough times.
-L_Return_Ready_Optional:
-    if (!(~(Easter_2010_QuestState >> E10_HELPED_DOCTOR_SHIFT) & E10_HELPED_DOCTOR_MASK) || ((Easter_2010_QuestState >> E10_HELPED_DOCTOR_TREE_SHIFT) & E10_HELPED_DOCTOR_TREE_MASK))
-        goto L_Return_Ready;
-
-    // Player can help one more time, if so desired.
-    mes "[Doctor]";
-    mes "";
-    mes "\"Well... this has been quite an adventure, hasn't it? I'd say it's about timey--er, time for me to go, but I think I can stick around for a little while longer to tie up some loose ends for myself.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, did you want to help again?\"";
-    next;
-    menu "Sure, that sounds good", L_At_Tree,
-            "Hm, I can't right now, but maybe later.", L_Return_Ready,
-            "I was looking for a way to go home.", L_Return_Capable,
-            "No, sorry, I don't think so.", L_Return_Ready;
-    close;
-
-// Player has done "everything" to do in this world, just talking to the Doctor.
-L_Return_Ready:
-    set @parting$, "!";
-    if (strcharinfo(0) == "Alonso" || strcharinfo(0) == "AlOnS") set @parting$, ", Alonso!";
-    mes "[Doctor]";
-    mes "";
-    mes "\"Well, you have been absolutely brilliant! Brilliant! Very impressive.\" He smiles kindly and shakes your hand. \"It has been a pleasure. Now for the next adventure. Allons-y" + @parting$ + "\"";
-    close;
-
-L_Defeat_Invader:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Ah-ha! It's nice to see you again. How goes the battle?\"";
-    next;
-    menu "I'm having a hard time, actually. I'd like to go home...", -,
-            "Regrouping now for the next encounter, actually.", L_Encourage;
-   goto L_Warning;
-
-L_Encourage:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, well, I think you'll prevail in the end! If you'll excuse me, I still have some things to see to.\"";
-    close;
-
-L_MidReward:
-    if (((Easter_2010_QuestState >> E10_FLAG_MID_REWARD_SHIFT) & E10_FLAG_MID_REWARD_MASK)) close;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Fantastic! You have really been quite helpful.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Er, now that I think about it, perhaps I have something you'd be interested in.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"While visiting another dimension--hm, as a matter of fact, it was quite like this one. But their choices in the past seem to have differed from the ones here...\"";
-	next;
-    mes "[Doctor]";
-    mes "";
-    mes "The Doctor reflects on his words. \"Interesting how things turn out. Well, I now have a lot of these Valentine's Glasses, if you'd like a pair.\"";
-    next;
-    getinventorylist;
-    if (@inventorylist_count == 100)
-        goto L_MidReward_NoRoom;
-    mes "[Doctor]";
-    mes "";
-    mes "He hands you the glasses.";
-    mes "\"They're not too brainy, or suited for detecting background radiation, but they are charming.\"";
-    set Easter_2010_QuestState, Easter_2010_QuestState & ~(E10_FLAG_MID_REWARD_MASK << E10_FLAG_MID_REWARD_SHIFT) | (E10_FLAG_MID_REWARD << E10_FLAG_MID_REWARD_SHIFT);
-    getitem E10_MIDREWARD_ID, 1;
-    close;
-
-L_MidReward_NoRoom:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, I don't think you have room for these. Well, I suppose I'll hold on to them for now.\"";
-    close;
-
-// Warning about the potential perils ahead, but the player must still want to abort the quest.
-L_Warning:
-    mes "[Doctor]";
-    mes "";
-    mes "\"There is no doubt in my mind that what awaits us is both powerful and dangerous, to say the least.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"If this... destruction, this disregard for life isn't an indication, what is?\"";
-    mes "He takes a moment, searching your face.";
-    next;
-    mes "[Doctor]";
-    mes "";
-    if (((Easter_2010_QuestState >> E10_HELPED_DOCTOR_SHIFT) & E10_HELPED_DOCTOR_MASK))
-        mes "\"I do appreciate your help thus far, really. And I did look forward to working with you again in putting an end to this devastation.\"";
-    if (!((Easter_2010_QuestState >> E10_HELPED_DOCTOR_SHIFT) & E10_HELPED_DOCTOR_MASK))
-        mes "\"Despite the danger, I think pressing on would certainly be a brave choice.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"But if you were to leave now, I'm afraid it would be impossible to return...\"";
-    mes "He pauses again. \"There is still time for you to turn back now, while it's relatively easy.\"";
-    next;
-    menu "N-no, I-I think I will continue... Yes, I'm ready!", -,
-            "Now that you mention it, maybe I'd better leave now while I can.", L_Turn_Back,
-            "Um, could I have a minute to think it over?", -;
-    close;
-
-L_Turn_Back:
-    mes "[Doctor]";
-    mes "";
-    mes "\"You really want to turn back now?\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"I don't think there's any shame in going back. Quite the contrary. You're brave for even being here.\"";
-    mes "He hesitates ever so slightly, choosing his words. \"I just wanted to make sure you were certain about your decision.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Once you've left, I don't see how you'll be able to return.\"";
-    next;
-    menu "On second thought, perhaps I will stick around.", -,
-            "No, no, I'm quite sure I want to leave.", L_Really_Return;
-    close;
-
-// The player definitely wants to go back, and there's no returning.
-L_Really_Return:
-    if ((Easter_2010_QuestState >> E10_FLAG_RETURN_READY_SHIFT) & E10_FLAG_RETURN_READY_MASK == E10_FLAG_RETURN_READY && (Easter_2010_QuestState >> E10_STATE_ROSE_SHIFT) & E10_STATE_ROSE_MASK == E10_STATE_ROSE_ROSE_COMPLETE)
-        goto L_Return_Capable;
-    mes "[Doctor]";
-    mes "";
-    mes "\"If that is what you want, then consider it done. And good luck.\"";
-    next;
-    goto L_Return_Player;
-
-L_Return_Player:
-    callsub S_Helped_Count;
-    if (countitem("DarkPetal") == 0 && @Easter_2010_helper < 3) goto L_Difficult_Return;
-    set Easter_2010_QuestState, (Easter_2010_QuestState & ~(E10_STATE_ROSE_MASK << E10_STATE_ROSE_SHIFT)) | (E10_STATE_ROSE_RETURNED << E10_STATE_ROSE_SHIFT);
-    if (@Easter_2010_helper < 3)
-        delitem "DarkPetal", 1;
-    savepoint "009-1", 52, 40;
-    warp "009-1", 0, 0;
-    close;
-
-L_Difficult_Return:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Hm... you don't seem to have the thing that brought you here, that petal, that I could have used to send you back... assuming you really do want to give up.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Others have been able to battle some darkness directly, which might serve as a substitute.\"";
-    mes "\"You could still help me here and elsewhere if you want to try to get this done once and for all, but if you want to go early you will need to fight, somehow.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Though there are others helping, too. No doubt that soon enough, you'll be able to go anyway...\"";
-    close;
-
-L_Return_Capable:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Hm. Oh, it looks like you've learned how to travel between these worlds on your own. Don't you remember the way?\"";
-    next;
-    menu "Oh, you're right! It was a spell, um..." + getspellinvocation("world-shift") + " was the name!", -;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Excellent! Though I suspect its effects will work best when you are closer to where you started.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"When you came to this world, where did you end up? I trust that is your origin.\"";
-    close;
-
-S_Dialogue_Knows:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, hello again... hm...\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes @responses$[rand(getarraysize(@responses$))];
-    return;
-
-S_Update_Knows:
-    // Working "name" for when he hasn't introduced himself (can be changed).
-    mes "[Mysterious Man]";
-    mes "";
-    mes @responses$[rand(getarraysize(@responses$))];
-    next;
-    set Easter_2010_QuestState, Easter_2010_QuestState & ~(E10_FLAG_KNOWS_DOCTOR_MASK << E10_FLAG_KNOWS_DOCTOR_SHIFT) | (E10_FLAG_KNOWS_DOCTOR << E10_FLAG_KNOWS_DOCTOR_SHIFT);
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, excuse me,\" he gestures. \"I'm the Doctor.\"";
-    return;
-
-S_Update_Helped:
-    set Easter_2010_QuestState, Easter_2010_QuestState & ~(E10_FLAG_HELPED_DOCTOR_TREE_MASK << E10_FLAG_HELPED_DOCTOR_TREE_SHIFT) | (E10_FLAG_HELPED_DOCTOR_TREE << E10_FLAG_HELPED_DOCTOR_TREE_SHIFT);
-    callsub S_Helped_Count;
-    if (@Easter_2010_helper == 3) set Easter_2010_QuestState, (Easter_2010_QuestState & ~(E10_STATE_ROSE_MASK << E10_STATE_ROSE_SHIFT)) | (E10_STATE_ROSE_ROSE_COMPLETE << E10_STATE_ROSE_SHIFT);
-    return;
-
-S_Helped_Count:
-    set @Easter_2010_helper, 0;
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_TREE_SHIFT) & E10_FLAG_HELPED_DOCTOR_TREE_MASK == E10_FLAG_HELPED_DOCTOR_TREE)
-        set @Easter_2010_helper, @Easter_2010_helper + 1;
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_ISLAND_SHIFT) & E10_FLAG_HELPED_DOCTOR_ISLAND_MASK == E10_FLAG_HELPED_DOCTOR_ISLAND)
-        set @Easter_2010_helper, @Easter_2010_helper + 1;
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_STONES_SHIFT) & E10_FLAG_HELPED_DOCTOR_STONES_MASK == E10_FLAG_HELPED_DOCTOR_STONES)
-        set @Easter_2010_helper, @Easter_2010_helper + 1;
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_FRUIT_SHIFT) & E10_FLAG_HELPED_DOCTOR_FRUIT_MASK == E10_FLAG_HELPED_DOCTOR_FRUIT)
-        set @Easter_2010_helper, @Easter_2010_helper + 1;
-    return;
-}
diff --git a/world/map/npc/easter/2010/Doctor2.txt b/world/map/npc/easter/2010/Doctor2.txt
deleted file mode 100644
index c98f71c2..00000000
--- a/world/map/npc/easter/2010/Doctor2.txt
+++ /dev/null
@@ -1,661 +0,0 @@
-// Doctor 2, at the island.
-
-028-1.gat,89,37,0	script	Doctor#who2	184,{
-// States here
-    callsub S_Helped_Count;
-    if (@Easter_2010_helper >= 2 && !((Easter_2010_QuestState >> E10_FLAG_MID_REWARD_SHIFT) & E10_FLAG_MID_REWARD_MASK))
-        goto L_MidReward;
-    if (@Easter_2010_helper == 4 && !((Easter_2010_QuestState >> E10_FLAG_RETURN_READY_SHIFT) & E10_FLAG_RETURN_READY_MASK))
-        goto L_Defeat_Invader;
-    if ((Easter_2010_QuestState >> E10_FLAG_RETURN_READY_SHIFT) & E10_FLAG_RETURN_READY_MASK == E10_FLAG_RETURN_READY && (Easter_2010_QuestState >> E10_STATE_ROSE_SHIFT) & E10_STATE_ROSE_MASK == E10_STATE_ROSE_ROSE_COMPLETE)
-        goto L_Return_Ready_Optional;
-
-// =======================
-// === Second location ===
-// =======================
-
-L_At_Island:
-    // Checks for if the player has already helped the doctor, either here or elsewhere, go here.
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_ISLAND_SHIFT) & E10_FLAG_HELPED_DOCTOR_ISLAND_MASK == E10_FLAG_HELPED_DOCTOR_ISLAND)
-        goto L_At_Island_Helped;
-
-    if ((Easter_2010_QuestState >> E10_FLAG_KNOWS_DOCTOR_SHIFT) & E10_FLAG_KNOWS_DOCTOR_MASK == E10_FLAG_KNOWS_DOCTOR)
-        goto L_At_Island_Knows_Doctor;
-
-    setarray @responses$, "\"Odd spheres of energy floating about... Interesting. The decay is very severe here...\" He looks over, as if only now noticing your presence. \"Excuse me, how do you do? Don't mean to be rude, just lost in thought...\"", "There's a man in glasses, scanning the area carefully. \"There are more trees affected than I had thought.\" He extends his hand, waving a small device around carefully.", "\"Well, so what does that mea--oh, sorry! Please don't mind me, but right now I'm trying to figure out why this world is dying.\"", "A somewhat oddly dressed man turns about. Suddenly, he speaks up, \"No, no, something's definitely wrong. Explain it? Well... it's complicated.\"";
-    callsub S_Update_Knows;
-    close;
-
-L_At_Island_Knows_Doctor:
-    setarray @responses$, "\"Oi! What killed these trees...\" He takes a moment, studying carefully. \"And this open area--there don't seem to be any creatures around. Interesting.",
-                          "\"Hm, do you know anything about those spheres of energy?\" The device he's holding glows briefly. \"Well, that's what I thought. If you'll excuse me for a moment.\" He adjusts his glasses and continues his work.",
-                          "\"There's the other, big tree... Then there are these trees, and... glowing orbs. Some... force is slowly destroying this world.\" The Doctor finishes his thought and continues pacing.",
-                          "The Doctor takes out the same strange device, anticipating a question and responding. \"Oh, this, it's good for everything. Right now I'm looking for what might be controlling these blobs of light; they don't seem to be moving on their own.\"",
-                         "\"I know there is some other agent at work here. I don't quite know what it is yet, but... Well, if you have any information that could help, please do share.\"";
-
-    callsub S_Dialogue_Knows;
-    next;
-
-L_At_Island_Menu:
-    setarray @menuitems$, "", "", "", "", "";
-    set @c, 0;
-
-    set @menuitems$[@c], "What's going on here? It looks like everything is dying! The trees are dead and decaying, the grass is weak and easily crushed, and the animals are gone!";
-    set @menuid[@c], E10_ISLAND_MENU_DEATH_AWE;
-    set @c, @c + 1;
-
-    set @menuitems$[@c], "There's an eerie sort of silence about this place, don't you think? ... Er, what was that?! ... It doesn't seem all that safe here...";
-    set @menuid[@c], E10_ISLAND_MENU_SCARED;
-    set @c, @c + 1;
-
-    set @menuitems$[@c], "The orbs of light flying about? Wisps. And you know, they do seem to be behaving strangely, or as much is possible given the circumstances. You think there's a reason for that?";
-    set @menuid[@c], E10_ISLAND_MENU_WISPS;
-    set @c, @c + 1;
-
-
-    if (!(Easter_2010_QuestState & (E10_FLAG_HELPED_DOCTOR_TREE << E10_FLAG_HELPED_DOCTOR_TREE_SHIFT))) goto L_post_tree_help;
-    set @menuitems$[@c], "This place looks dead... do you need any more lifestones?";
-    set @menuid[@c], E10_ISLAND_MENU_OFFER_LIFESTONE;
-    set @c, @c + 1;
-
-L_post_tree_help:
-    menu
-        @menuitems$[0], -,
-        @menuitems$[1], -,
-        @menuitems$[2], -,
-        @menuitems$[3], -,
-        @menuitems$[4], -,
-        "I'm actually more interested in going home.", L_Warning;
-
-    set @menu, @menu -1;
-    if (@menu >= @c) close;
-    if (@menuid[@menu] == E10_ISLAND_MENU_DEATH_AWE) goto L_At_Island_Death_Awe;
-    if (@menuid[@menu] == E10_ISLAND_MENU_SCARED) goto L_At_Island_Scared;
-    if (@menuid[@menu] == E10_ISLAND_MENU_WISPS) goto L_At_Island_Wisps;
-    if (@menuid[@menu] == E10_ISLAND_MENU_OFFER_LIFESTONE) goto L_At_Island_Offer_Lifestone;
-    close;
-
-L_At_Island_Death_Awe:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Yes, yes. For most, death can't be avoided, but this...\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"So much death, and so quickly, even. It doesn't seem quite natural, does it?\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Take a look at this, won't you?\"";
-    next;
-    menu "I'm not sure, what am I looking for exactly?", -;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Ah, you don't see it? Well, these glasses of mine--well, here, take a look\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "The Doctor takes off his red-blue glasses and holds them up. You peer through and examine the surroundings.";
-    next;
-    menu "I... don't see anything unusual, sorry.", -,
-            "Oh, something about the grass?", L_At_Island_Grass,
-            "Er, what exactly do these glasses do?", L_At_Island_Glasses,
-            "Oh, so the... the um... that?", -,
-            "Right, of course, that is... very... interesting?", -,
-            "Could you hold that thought? I need to check on something else first.", -;
-    close;
-
-L_At_Island_Grass:
-    mes "[Doctor]";
-    mes "";
-    mes "The Doctor pauses, examining the ground. \"Now that you mention it...\" He holds up a blade of grass between his fingers. \"There is a sort of strange texture about it, perhaps slightly grating.\"";
-    next;
-    menu "Yes, I had noticed that, too. Do you think it's relevant?", L_At_Island_Explain,
-            "Hm, now that I think about it, it doesn't seem all too different from my own world's.", L_At_Island_Explain,
-            "Do you think it's a result of all the death here?", L_At_Island_Explain,
-            "Oh, excuse me for just a second.", -;
-    close;
-
-L_At_Island_Glasses:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Well, I had suspected that what may have been causing damage to this world was in fact from another universe.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"So you can think of these glasses as the means to identifying when something or someone has gone through the Void.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Here, let me show you.\" The Doctor turns the glasses so you can view him and moves around.";
-    next;
-    menu "Oh, wow. There's a sort of... grainy effect about you. Like particles?", -;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Yes, stuff from the Void. I saw something earlier, but nothing now. Strange.\"";
-    close;
-
-L_At_Island_Explain:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Well, from the other things I've seen here, I wouldn't couldn't say so definitively, but it's possible.\"";
-    next;
-    mes "Your eyes follow the Doctor as he begins to pace. He pauses to continue his thought.";
-    next;
-    mes "[Doctor]";
-    mes "";
-    if ((Easter_2010_QuestState >> E10_HELPED_DOCTOR_SHIFT) & E10_HELPED_DOCTOR_MASK)
-        goto L_At_Island_Theory;
-    mes "\"Well, it's interesting. I'll have to take a closer look.\"";
-    close;
-
-L_At_Island_Theory:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Based on what we had uncovered before, I think some force is exerting its will on those glowing entities.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"How it all ties together is what I'm still trying to figure out.\" He adjusts his glasses again.";
-    next;
-    menu "It is very strange, can't argue there.", -,
-            "I have faith in you.", -,
-            "What if--oh, are you thinking about something?", L_At_Island_Knows_Doctor,
-            "Yes, that is an interesting idea. I will think it over for a bit.", -;
-    close;
-
-L_At_Island_Scared:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Ahh, feeling a bit anxious are we? I don't blame you, chap, it is a bit unnerving here.\" The Doctor continues to analyze the environment with his various instruments, apparently lost in thought.";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"It's really quite strange... the levels of electromagnetic energy in the area seem to be spiking regularly, almost in time with the movements of these glowing blobs.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Judging from these readouts, it would seem that either some force is acting upon these orbs of light, or they are in fact creating a sporadic magnetic field.\"";
-    next;
-    menu "What? I'm just really, really scared!", L_At_Island_Terror,
-            "Electromagnetic what now?", L_At_Island_Magnetic,
-            "I've got to get out of here!", L_At_Island_Terror,
-            "Um, uh, I... gotta run... to some place more safe.", L_At_Island_Terror;
-    close;
-
-L_At_Island_Terror:
-    mes "[Doctor]";
-    mes "";
-    if (BaseLevel == 99)
-        mes "\"Really? Out of those I've detected here, I would have thought you'd be among the most skilled.\"";
-    if (BaseLevel >= 90 && BaseLevel <= 98)
-        mes "\"Er, um? I'm so sorry, I had assumed you were more than capable for this sort of thing.";
-    if (BaseLevel >= 70 && BaseLevel <= 89)
-        mes "\"Please excuse me, but I had sensed you were stronger than that.\"";
-    if (BaseLevel >= 50 && BaseLevel <= 69)
-        mes "\"Ah... well, I have seen others here, too. Perhaps you could work together?\"";
-    if (BaseLevel <= 49)
-        mes "\"Don't lose hope, you're not alone in all this. We'll get through it.\"";
-    next;
-    menu "I don't know what to say...", -,
-            "Yes, yes, you're absolutely right!", L_At_Island_Calm,
-            "I-I need a moment to think.", -;
-    close;
-
-L_At_Island_Magnetic:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Well, haven't you noticed the strange behaviour of those blobs of light?\"";
-    next;
-    menu "Um, strange doesn't even begin to cover this world.", -,
-            "Sure, I can never find enough stuff after fighting them.", L_At_Island_Loot,
-            "Other than the fact that they wish to kill me?", L_At_Island_Wisps,
-            "Blobs? I hadn't noticed anything.",L_At_Island_Knows_Doctor;
-    close;
-
-L_At_Island_Calm:
-    mes "[Doctor]";
-    mes "";
-    mes "\"There, isn't that better?\" He smiles warmly. \"Now, I was thinking--\"";
-    next;
-    menu "Sorry to interrupt, but...", L_At_Island_Menu,
-            "*I* was thin--oh, thought you were pausing. Sorry, please continue.", L_At_Island_Theory,
-            "Sorry, I need another moment to regain my composure.", -;
-    close;
-
-L_At_Island_Loot:
-    mes "[Doctor]";
-    mes "";
-    mes "He seems confused. \"Find enough stuff? I'm not sure I could help you there, but perhaps someone else can?\"";
-    close;
-
-L_At_Island_Wisps:
-    mes "[Doctor]";
-    mes "";
-    mes "\"I'm glad you asked! You see, the behaviour of these creatures doesn't appear to be very natural at all; the elephant in the room if you will.\" The Doctor pauses temporarily to check his instruments again.";
-    next;
-    menu "Well, they are normally very peaceful; they'll only attack if you attack them.", -;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Interesting! I've seen them attack with no discernable provocation. This is quite ominous. \"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\If it didn't sound so mad, I'd postulate that something is controlling these things... some malevolent force or entity.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, sorry, what do you think?\"";
-    next;
-    menu "That doesn't seem quite right, to be honest.", -,
-            "Now that you mention it, I had some ideas.", L_At_Island_Ideas,
-            "Malevolent? Where did you get that idea?", -,
-            "Instruments? They seem quite versatile.", L_At_Island_Devices,
-            "That's a lot for me to take in right now. Excuse me.", -;
-    close;
-
-L_At_Island_Ideas:
-    menu "Strange behaviour comes up with magic in my world, like agitating creatures to do harm.", L_At_Island_Magic,
-            "Maybe something or someone is summoning them?", L_At_Island_Summon,
-            "Could it be possible they're not from this place, either?", L_At_Island_Void,
-            "Maybe this sounds crazy, but... could these be the remains of all the entities that have died?", L_At_Island_Spirits,
-            "I don't understand time all that well, but perhaps the wisps indicate a rip... in the fabric?", L_At_Island_Time,
-            "Er, how embarrassing. I seem to have forgotten what I was going to say.", -;
-    close;
-
-L_At_Island_Devices:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Hm? Oh, ha-ha, like this?\" The Doctor points out one of the instruments.";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"They are very useful, yes! Fantastic, even. Proved invaluable in so many circumstances.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Yes. Well, then.\" He continues his analysis, putting something away, almost in anticipation of your next question.";
-    close;
-
-L_At_Island_Magic:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Magic, you say? Yes, I have been hearing about that from others, too.\"";
-    mes "The Doctor looks off into the distance.";
-    next;
-    menu "Erm? Hello?", -;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Still here, just wondering. So you say it's possible to aggravate creatures where you come from?\"";
-    next;
-    menu "Yes, within a certain radius of the caster, it is possible.", -;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Really? Ha-ha! I knew it. Tell me more, could you? Anything particular about the practice of magic in your world?\"";
-    next;
-    menu "Well... it is possible to follow a darker path, so to speak, when it comes to practicing magic.", L_At_Island_Dark,
-            "Hm. Not sure if it's relevant, but I have often suspected an unknown evil in my own world.", L_At_Island_Dark,
-            "Even the 'good' practicioners seem to exhibit malicious behaviour at times.", L_At_Island_Evil,
-            "I don't know much more than that, I'm afraid.", -;
-    close;
-
-L_At_Island_Summon:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Summoning them? Via some sort of magic, presumably, or do you mean by other means?\"";
-    next;
-    menu "Yes, with magic, I think. The creatures can be aggravated, even.", L_At_Island_Magic,
-            "Other means? I never thought of that. Could you explain?", L_At_Island_Void,
-            "On second thought, I've lost my train of thought.", -;
-    close;
-
-L_At_Island_Void:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Sure, it is a distinct possibility.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"The Void, or otherwise this sort of, empty space between universes.\"";
-    mes "\"It might be easier to think about the universes as being stacked on top of one another, though can't quite say there's an up or a down about the Void.\"";
-    close;
-
-L_At_Island_Spirits:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Sort of like spirits?\" Or are you suggesting that these blobs are the collective energy lost upon death?\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Um, I'm not sure what to make of that.\"";
-    close;
-
-L_At_Island_Time:
-    mes "[Doctor]";
-    mes "\"Time, did you say?\" He takes a moment. \"Well, it's more like a big ball--it's probably not what you think. But you know? I have detected temporal abnormalities here.\"";
-    close;
-
-L_At_Island_Dark:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Your home isn't all that safe? Are there regular patrols, or is there a shortage of help?\"";
-    next;
-    menu "I forgot what we were talking about. Something about the wisps?", L_At_Island_Wisps,
-            "Well, either way, I can't quite compare that to this... sinister atmosphere.", -,
-            "It--wait, a shortage? Well...", L_At_Island_Help;
-    mes "[Doctor]";
-    mes "";
-    mes "\"That feeling does pervade this world. A darkness that wishes to smother and extinguish all in its path.\"";
-    next;
-    menu "Maybe a poison was unleashed, and it's what's causing the death, and the erratic behaviour?", -,
-            "So, could the behaviour of these wisps be explained by magic?", -,
-            "Could we start over? I was trying to recall what you said--hello?", L_At_Island_Knows_Doctor,
-             "Well, the effects, though widespread, seem to be more severe at times.", L_At_Island_Evil;
-    mes "[Doctor]";
-    mes "";
-    mes "\"A very valid idea. Hm...\"";
-    close;
-
-L_At_Island_Evil:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Yes, sadly that does seem to be the case at times. I feel we've almost solved at least this mystery. Just... definitively, what would you say is going on here?\"";
-    next;
-    setarray @menuitems$,
-     "I think the wisps are drawn to those that have died, like... me? And when they become aggravated they end up destroying more of the world.",
-        "In order to escape, the beings that have died and ended up here are forced to... fight?",
-        "An evil force placed a curse on all of us, dooming us to fight here, pitted against one another in pointless battle--for all eternity!",
-        "The trees are dead as a result of the fighting, and the wisps are angry spirits looking for revenge?",
-        "This world is in disarray, subject to chaos, and ultimately, utter destruction. Those, like me, have been given an opportunity, a choice--to put an end to this, to drive out the evil stench that plagues this land.",
-        "Unlike me, the old woman that led me here was not without hidden motives. So, she planted a way to bring me here, and in doing so, eliminated the ones that could foil her plans.",
-        "When I died and came here, my soul was fragmented, and part of it manifested as the tormented wisps here now?",
-        "You do seem rather odd, using those alien devices. I think you're to blame for what's happened here!",
-        "Something, or someone, perhaps, walks this world, appearing from the shadows. With it come misery and pain. But it is up to us to rid this world of its blight.",
-        "There is an intermittent, evil presence in this world. When it arrives it brings about more destruction, resulting in these dead trees. Then, at the whim of its madness, it uses magic to incite the wisps to attack and be unwilling accomplices.";
-    setarray @submenu$, "", "", "", "";
-    setarray @submenuindex, 0, 0, 0, 0;
-    set @c, 0;
-
-L_island_end_menu_loop:
-    set @index, rand(getarraysize(@menuitems$));
-    set @i, 0;
-    if (@c == 0) goto L_island_post_menu_loop_sub;
-L_island_end_menu_loop_sub:
-    if (@submenu$[@i] == @menuitems$[@index]) goto L_island_end_menu_loop;
-    set @i, @i + 1;
-    if (@i < @c) goto L_island_end_menu_loop_sub;
-L_island_post_menu_loop_sub:
-    set @submenu$[@i], @menuitems$[@index];
-    set @submenuindex[@i], @index;
-    set @c, @c + 1;
-    if (@c < 4) goto L_island_end_menu_loop;
-
-    menu @submenu$[0], -,
-         @submenu$[1], -,
-         @submenu$[2], -,
-         @submenu$[3], -;
-    set @menu, @menu - 1;
-    if (@menu >= 4 || @menu < 0) goto L_island_oo_range;
-    if (@submenuindex[@menu] == 8 || @submenuindex[@menu] == 9)
-        goto L_At_Island_Resolve;
-
-L_island_oo_range:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Ah, I'm sorry, but that doesn't seem to fit with what we know. Perhaps we should give this some more thought.\"";
-    close;
-
-L_At_Island_Help:
-    menu "Yes, help is probably needed, but I hadn't really considered my own role...", -,
-            "Perhaps, but it's not really my problem.", -;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Just as you are helping here, I believe that if it is what you desire, you can find a suitable way to help elsewhere, too.\"";
-    close;
-
-L_At_Island_Resolve:
-    callsub S_Update_Helped;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Ha-ha, that's it! Brilliant!\" He shakes your hand enthusiastically. \"I knew you could do it! You don't know how much your help means!\"";
-    close;
-
-L_At_Island_Offer_Lifestone:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Hm, no, while I appreciate your generosity, I don't think that will be necessary.\"";
-    mes "He looks off into the distance. \"Strange things...\"";
-    close;
-
-L_At_Island_Helped:
-    mes "[Doctor]";
-    mes "";
-    mes "The Doctor smiles. \"A disturbing force is devastating this world. But with your help I think we're well on our way. Indeed.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Well, I won't keep you, still rather busy. Should probably survey some other regions, too.\" The Doctor's words trail off as he returns to thought.";
-    next;
-    menu "Okay, I'll see you around!", -,
-            "Actually, I'd like to go home now. Any chance you could help?", L_Warning;
-    close;
-
-// ===================================================================
-// Helper portions, duplicated in each script for want of time, sorry.
-// ===================================================================
-
-// The player has defeated the invader and helped enough times.
-L_Return_Ready_Optional:
-    if (!(~(Easter_2010_QuestState >> E10_HELPED_DOCTOR_SHIFT) & E10_HELPED_DOCTOR_MASK) || ((Easter_2010_QuestState >> E10_HELPED_DOCTOR_ISLAND_SHIFT) & E10_HELPED_DOCTOR_ISLAND_MASK))
-        goto L_Return_Ready;
-
-    // Player can help one more time, if so desired.
-    mes "[Doctor]";
-    mes "";
-    mes "\"Well... this has been quite an adventure, hasn't it? I'd say it's about timey--er, time for me to go, but I think I can stick around for a little while longer to tie up some loose ends for myself.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, did you want to help again?\"";
-    next;
-    menu "Sure, that sounds good", L_At_Island,
-            "Hm, I can't right now, but maybe later.", L_Return_Ready,
-            "I was looking for a way to go home.", L_Return_Capable,
-            "No, sorry, I don't think so.", L_Return_Ready;
-    close;
-
-// Player has done "everything" to do in this world, just talking to the Doctor.
-L_Return_Ready:
-    set @parting$, "!";
-    if (strcharinfo(0) == "Alonso" || strcharinfo(0) == "AlOnS") set @parting$, ", Alonso!";
-    mes "[Doctor]";
-    mes "";
-    mes "\"Well, you have been absolutely brilliant! Brilliant! Very impressive.\" He smiles kindly and shakes your hand. \"It has been a pleasure. Now for the next adventure. Allons-y" + @parting$ + "\"";
-    close;
-
-L_Defeat_Invader:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Ah-ha! It's nice to see you again. How goes the battle?\"";
-    next;
-    menu "I'm having a hard time, actually. I'd like to go home...", -,
-            "Regrouping now for the next encounter, actually.", L_Encourage;
-    goto L_Warning;
-
-L_Encourage:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, well, I think you'll prevail in the end! If you'll excuse me, I still have some things to see to.\"";
-    close;
-
-L_MidReward:
-    if (((Easter_2010_QuestState >> E10_FLAG_MID_REWARD_SHIFT) & E10_FLAG_MID_REWARD_MASK)) close;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Fantastic! You have really been quite helpful.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Er, now that I think about it, perhaps I have something you'd be interested in.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"While visiting another dimension--hm, as a matter of fact, it was quite like this one. But their choices in the past seem to have differed from the ones here...\"";
-	next;
-    mes "[Doctor]";
-    mes "";
-    mes "The Doctor reflects on his words. \"Interesting how things turn out. Well, I now have a lot of these Valentine's Glasses, if you'd like a pair.\"";
-    next;
-    getinventorylist;
-    if (@inventorylist_count == 100)
-        goto L_MidReward_NoRoom;
-    mes "[Doctor]";
-    mes "";
-    mes "He hands you the glasses.";
-    mes "\"They're not too brainy, or suited for detecting background radiation, but they are charming.\"";
-    set Easter_2010_QuestState, Easter_2010_QuestState & ~(E10_FLAG_MID_REWARD_MASK << E10_FLAG_MID_REWARD_SHIFT) | (E10_FLAG_MID_REWARD << E10_FLAG_MID_REWARD_SHIFT);
-    getitem E10_MIDREWARD_ID, 1;
-    close;
-
-L_MidReward_NoRoom:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, I don't think you have room for these. Well, I suppose I'll hold on to them for now.\"";
-    close;
-
-// Warning about the potential perils ahead, but the player must still want to abort the quest.
-L_Warning:
-    mes "[Doctor]";
-    mes "";
-    mes "\"There is no doubt in my mind that what awaits us is both powerful and dangerous, to say the least.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"If this... destruction, this disregard for life isn't an indication, what is?\"";
-    mes "He takes a moment, searching your face.";
-    next;
-    mes "[Doctor]";
-    mes "";
-    if (((Easter_2010_QuestState >> E10_HELPED_DOCTOR_SHIFT) & E10_HELPED_DOCTOR_MASK))
-        mes "\"I do appreciate your help thus far, really. And I did look forward to working with you again in putting an end to this devastation.\"";
-    if (!((Easter_2010_QuestState >> E10_HELPED_DOCTOR_SHIFT) & E10_HELPED_DOCTOR_MASK))
-        mes "\"Despite the danger, I think pressing on would certainly be a brave choice.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"But if you were to leave now, I'm afraid it would be impossible to return...\"";
-    mes "He pauses again. \"There is still time for you to turn back now, while it's relatively easy.\"";
-    next;
-    menu "N-no, I-I think I will continue... Yes, I'm ready!", -,
-            "Now that you mention it, maybe I'd better leave now while I can.", L_Turn_Back,
-            "Um, could I have a minute to think it over?", -;
-    close;
-
-L_Turn_Back:
-    mes "[Doctor]";
-    mes "";
-    mes "\"You really want to turn back now?\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"I don't think there's any shame in going back. Quite the contrary. You're brave for even being here.\"";
-    mes "He hesitates ever so slightly, choosing his words. \"I just wanted to make sure you were certain about your decision.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Once you've left, I don't see how you'll be able to return.\"";
-    next;
-    menu "On second thought, perhaps I will stick around.", -,
-            "No, no, I'm quite sure I want to leave.", L_Really_Return;
-    close;
-
-// The player definitely wants to go back, and there's no returning.
-L_Really_Return:
-    if ((Easter_2010_QuestState >> E10_FLAG_RETURN_READY_SHIFT) & E10_FLAG_RETURN_READY_MASK == E10_FLAG_RETURN_READY && (Easter_2010_QuestState >> E10_STATE_ROSE_SHIFT) & E10_STATE_ROSE_MASK == E10_STATE_ROSE_ROSE_COMPLETE)
-        goto L_Return_Capable;
-    mes "[Doctor]";
-    mes "";
-    mes "\"If that is what you want, then consider it done. And good luck.\"";
-    next;
-    goto L_Return_Player;
-
-L_Return_Player:
-    callsub S_Helped_Count;
-    if (countitem("DarkPetal") == 0 && @Easter_2010_helper < 3) goto L_Difficult_Return;
-    set Easter_2010_QuestState, (Easter_2010_QuestState & ~(E10_STATE_ROSE_MASK << E10_STATE_ROSE_SHIFT)) | (E10_STATE_ROSE_RETURNED << E10_STATE_ROSE_SHIFT);
-    if (@Easter_2010_helper < 3)
-        delitem "DarkPetal", 1;
-    savepoint "009-1", 52, 40;
-    warp "009-1", 0, 0;
-    close;
-
-L_Difficult_Return:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Hm... you don't seem to have the thing that brought you here, that petal, that I could have used to send you back... assuming you really do want to give up.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Others have been able to battle some darkness directly, which might serve as a substitute.\"";
-    mes "\"You could still help me here and elsewhere if you want to try to get this done once and for all, but if you want to go early you will need to fight, somehow.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Though there are others helping, too. No doubt that soon enough, you'll be able to go anyway...\"";
-    close;
-
-L_Return_Capable:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Hm. Oh, it looks like you've learned how to travel between these worlds on your own. Don't you remember the way?\"";
-    next;
-    menu "Oh, you're right! It was a spell, um..." + getspellinvocation("world-shift") + " was the name!", -;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Excellent! Though I suspect its effects will work best when you are closer to where you started.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"When you came to this world, where did you end up? I trust that is your origin.\"";
-    close;
-
-S_Dialogue_Knows:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, hello again... hm...\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes @responses$[rand(getarraysize(@responses$))];
-    return;
-
-S_Update_Knows:
-    // Working "name" for when he hasn't introduced himself (can be changed).
-    mes "[Mysterious Man]";
-    mes "";
-    mes @responses$[rand(getarraysize(@responses$))];
-    next;
-    set Easter_2010_QuestState, Easter_2010_QuestState & ~(E10_FLAG_KNOWS_DOCTOR_MASK << E10_FLAG_KNOWS_DOCTOR_SHIFT) | (E10_FLAG_KNOWS_DOCTOR << E10_FLAG_KNOWS_DOCTOR_SHIFT);
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, excuse me,\" he gestures. \"I'm the Doctor.\"";
-    return;
-
-S_Update_Helped:
-    set Easter_2010_QuestState, Easter_2010_QuestState & ~(E10_FLAG_HELPED_DOCTOR_ISLAND_MASK << E10_FLAG_HELPED_DOCTOR_ISLAND_SHIFT) | (E10_FLAG_HELPED_DOCTOR_ISLAND << E10_FLAG_HELPED_DOCTOR_ISLAND_SHIFT);
-    callsub S_Helped_Count;
-    if (@Easter_2010_helper == 3) set Easter_2010_QuestState, (Easter_2010_QuestState & ~(E10_STATE_ROSE_MASK << E10_STATE_ROSE_SHIFT)) | (E10_STATE_ROSE_ROSE_COMPLETE << E10_STATE_ROSE_SHIFT);
-    return;
-
-S_Helped_Count:
-    set @Easter_2010_helper, 0;
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_TREE_SHIFT) & E10_FLAG_HELPED_DOCTOR_TREE_MASK == E10_FLAG_HELPED_DOCTOR_TREE)
-        set @Easter_2010_helper, @Easter_2010_helper + 1;
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_ISLAND_SHIFT) & E10_FLAG_HELPED_DOCTOR_ISLAND_MASK == E10_FLAG_HELPED_DOCTOR_ISLAND)
-        set @Easter_2010_helper, @Easter_2010_helper + 1;
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_STONES_SHIFT) & E10_FLAG_HELPED_DOCTOR_STONES_MASK == E10_FLAG_HELPED_DOCTOR_STONES)
-        set @Easter_2010_helper, @Easter_2010_helper + 1;
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_FRUIT_SHIFT) & E10_FLAG_HELPED_DOCTOR_FRUIT_MASK == E10_FLAG_HELPED_DOCTOR_FRUIT)
-        set @Easter_2010_helper, @Easter_2010_helper + 1;
-    return;
-}
diff --git a/world/map/npc/easter/2010/Doctor3.txt b/world/map/npc/easter/2010/Doctor3.txt
deleted file mode 100644
index 7d8bfa8c..00000000
--- a/world/map/npc/easter/2010/Doctor3.txt
+++ /dev/null
@@ -1,586 +0,0 @@
-// Doctor 3, at the stones.
-
-028-1.gat,71,98,0	script	Doctor#who3	184,{
-    // States here
-    callsub S_Helped_Count;
-    if (@Easter_2010_helper >= 2 && !((Easter_2010_QuestState >> E10_FLAG_MID_REWARD_SHIFT) & E10_FLAG_MID_REWARD_MASK))
-        goto L_MidReward;
-    if (@Easter_2010_helper == 4 && !((Easter_2010_QuestState >> E10_FLAG_RETURN_READY_SHIFT) & E10_FLAG_RETURN_READY_MASK))
-        goto L_Defeat_Invader;
-    if ((Easter_2010_QuestState >> E10_FLAG_RETURN_READY_SHIFT) & E10_FLAG_RETURN_READY_MASK == E10_FLAG_RETURN_READY && (Easter_2010_QuestState >> E10_STATE_ROSE_SHIFT) & E10_STATE_ROSE_MASK == E10_STATE_ROSE_ROSE_COMPLETE)
-        goto L_Return_Ready_Optional;
-
-// =======================
-// === Third  location ===
-// =======================
-
-L_At_Stones:
-    // Checks for if the player has already helped the doctor, either here or elsewhere, go here.
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_STONES_SHIFT) & E10_FLAG_HELPED_DOCTOR_STONES_MASK == E10_FLAG_HELPED_DOCTOR_STONES)
-        goto L_At_Stones_Helped;
-
-    if ((Easter_2010_QuestState >> E10_FLAG_KNOWS_DOCTOR_SHIFT) & E10_FLAG_KNOWS_DOCTOR_MASK == E10_FLAG_KNOWS_DOCTOR)
-        goto L_At_Stones_Knows_Doctor;
-
-    setarray @responses$, "\"There's something definitely unsettling about this region. Do you sense it, too?\" His acknowledgement comes suddenly and as a surprise. Something whirs and beeps as he continues, \"Oh, yes, this very spot.\"", "\"An abnormality! Yes, yes, here! Here! No, not quite imperceptible, but we must exercise caution, wouldn't you agree?\"", "\"The mysterious man paces from side to side, quickly taking notice. \"Um, I would be careful around here if I were you. I'm detecting something very powerful nearby.\"", "\"Er, that's interesting. Do you see this? It's remarkable, really. Terrifying all the same, but remarkable. Still not quite sure what makes *this* spot special.\"";
-    callsub S_Update_Knows;
-    close;
-
-L_At_Stones_Knows_Doctor:
-    setarray @responses$, "\"So from what I've gathered, this area here is somehow involved. See the stones? Yes, right there. The readings suggest it's something very, very strong.\"", "The Doctor takes a closer look at the stones on the ground. \"Interesting, don't you think?\" He waves the small device about as it beeps. \"Perhaps I'm missing something.\"", "\"If I had a, um... well, I don't know what it is. Yet. But what I do know is that there's a dark, disturbing presence here.\"", "\"Hm. The readings here were the highest.\" You take a second to look around as the Doctor continues. \"Ah, yes! I will likely be needing something... maybe similar in nature to this evil presence?\"", "\"Shouldn't get too close there. Ah, yes, be careful there. An evil consumes the life os this world, and my analysis led me to this area.\"", "\"Well, you don't see that every day, do you? Er, well, it's not that strange for me, I think. If I am correct, some agent is at work here, behind the scenes. For now, if you think of anything that might help, please let me know.\"";
-    callsub S_Dialogue_Knows;
-    next;
-
-L_At_Stones_Menu:
-    mes "[Doctor]";
-    mes "";
-    mes "\"This place... there's something, I'm not sure what. But I know there's something... something dark!\"";
-    next;
-    menu
-        "Wow! How can you tell?", L_stones_light,
-        "Do you need any more help?", L_stones_offer,
-        "Er, pardon me? Did you hear what I said?", L_At_Stones_Pardon,
-        "Actually, I was hoping you could help me leave this world.", L_Warning,
-        "Good luck with that.", -;
-    close;
-
-L_At_Stones_Pardon:
-    mes "[Doctor]";
-    mes "";
-    mes "\"H'm, what? Oh, hello...\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"But this...\" - the man waves a strange, beeping device in the air - \"surely that must mean... oh? You're still here?\"";
-    next;
-    menu
-        "What's that thing you've got there?", L_stones_device,
-        "Sure I am. Do you need help with anything?", L_stones_offer,
-        "I was just leaving.", -;
-    close;
-
-L_stones_device:
-    mes "[Doctor]";
-    mes "";
-    mes "\"This? Oh, it's just an ordinary megalectrometer. Good model, though.\"";
-    next;
-    menu
-        "I'm intrigued. Do you need any help?", L_stones_offer,
-        "Megalawhat? I knew you were a crazy!", -;
-    close;
-
-L_stones_light:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Well, it's obvious.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"The red light on my megalectrometer's come on.\"";
-    next;
-    menu
-        "Uh, okay. So... you need any more help?", L_stones_offer,
-        "I've got better things to do. Bye.", -;
-    close;
-
-// Now comes the confusing part.
-L_stones_offer:
-    setarray @menuitems$, "", "", "", "", "", "", "", "", "", "", "", "", "", "";
-    set @c, 0;
-
-    if (countitem("WispPowder") < 1) goto L_stones_wisp;
-    set @menuitems$[@c], "Wisp Powder?";
-    set @menuid[@c], E10_STONES_WISP;
-    set @c, @c + 1;
-
-L_stones_wisp:
-    if (countitem("SpectrePowder") < 1) goto L_stones_spectre;
-    set @menuitems$[@c], "Spectre Powder?";
-    set @menuid[@c], E10_STONES_SPECTRE;
-    set @c, @c + 1;
-
-L_stones_spectre:
-    if (countitem("PoltergeistPowder") < 1) goto L_stones_poltergeist;
-    set @menuitems$[@c], "Poltergeist Powder?";
-    set @menuid[@c], E10_STONES_POLTERGEIST;
-    set @c, @c + 1;
-
-L_stones_poltergeist:
-    if (countitem("DiseasedHeart") < 1) goto L_stones_soul;
-    set @menuitems$[@c], "A Diseased Heart?";
-    set @menuid[@c], E10_STONES_HEART;
-    set @c, @c + 1;
-
-L_stones_soul:
-    if (countitem("JackOSoul") < 1) goto L_stones_heart;
-    set @menuitems$[@c], "A Jack O Soul?";
-    set @menuid[@c], E10_STONES_SOUL;
-    set @c, @c + 1;
-
-L_stones_heart:
-    if (countitem("UndeadEar") < 1) goto L_stones_ear;
-    set @menuitems$[@c], "An Undead Ear?";
-    set @menuid[@c], E10_STONES_EAR;
-    set @c, @c + 1;
-
-L_stones_ear:
-    if (countitem("UndeadEye") < 1) goto L_stones_eye;
-    set @menuitems$[@c], "An Undead Eye?";
-    set @menuid[@c], E10_STONES_EYE;
-    set @c, @c + 1;
-
-L_stones_eye:
-    if (countitem("Bone") < 1) goto L_stones_bone;
-    set @menuitems$[@c], "A Bone?";
-    set @menuid[@c], E10_STONES_BONE;
-    set @c, @c + 1;
-
-L_stones_bone:
-    if (countitem("Skull") < 1) goto L_stones_skull;
-    set @menuitems$[@c], "A Skull?";
-    set @menuid[@c], E10_STONES_SKULL;
-    set @c, @c + 1;
-
-L_stones_skull:
-    if (countitem("DarkCrystal") < 1) goto L_stones_crystal;
-    set @menuitems$[@c], "A Dark Crystal?";
-    set @menuid[@c], E10_STONES_CRYSTAL;
-    set @c, @c + 1;
-
-L_stones_crystal:
-    if (countitem("RottenRags") < 1) goto L_stones_rags;
-    set @menuitems$[@c], "Rotten Rags?";
-    set @menuid[@c], E10_STONES_RAGS;
-    set @c, @c +1;
-
-L_stones_rags:
-    if (countitem("DarkPetal") < 1) goto L_stones_petal;
-    set @menuitems$[@c], "A Dark Petal?";
-    set @menuid[@c], E10_STONES_PETAL;
-    set @c, @c + 1;
-
-L_stones_petal:
-    set @menuitems$[@c], "No, I don't have anything like that.";
-    set @menuid[@c], E10_STONES_NEVERMIND;
-    set @c, @c + 1;
-
-    mes "[Doctor]";
-    mes "";
-    mes "\"I doubt you could help, since you wouldn't have - actually, you might. Coming from another world and all.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"I need something dark. Something connected with death... a deathly item. Sort of thing. Do you have anything of this kind?\"";
-    next;
-    menu
-        @menuitems$[0], -,
-        @menuitems$[1], -,
-        @menuitems$[2], -,
-        @menuitems$[3], -,
-        @menuitems$[4], -,
-        @menuitems$[5], -,
-        @menuitems$[6], -,
-        @menuitems$[7], -,
-        @menuitems$[8], -,
-        @menuitems$[9], -,
-        @menuitems$[10], -,
-        @menuitems$[11], -,
-        @menuitems$[12], -,
-        @menuitems$[13], -;
-
-    set @menu, @menu -1;
-    if (@menu >= @c) close;
-    if (@menuid[@menu] == E10_STONES_WISP) goto L_stones_offer_wisp;
-    if (@menuid[@menu] == E10_STONES_SPECTRE) goto L_stones_offer_spectre;
-    if (@menuid[@menu] == E10_STONES_POLTERGEIST) goto L_stones_offer_poltergeist;
-    if (@menuid[@menu] == E10_STONES_SOUL) goto L_stones_offer_soul;
-    if (@menuid[@menu] == E10_STONES_HEART) goto L_stones_offer_heart;
-    if (@menuid[@menu] == E10_STONES_EAR) goto L_stones_offer_ear;
-    if (@menuid[@menu] == E10_STONES_EYE) goto L_stones_offer_eye;
-    if (@menuid[@menu] == E10_STONES_BONE) goto L_stones_offer_bone;
-    if (@menuid[@menu] == E10_STONES_SKULL) goto L_stones_offer_skull;
-    if (@menuid[@menu] == E10_STONES_CRYSTAL) goto L_stones_offer_crystal;
-    if (@menuid[@menu] == E10_STONES_RAGS) goto L_stones_offer_rags;
-    if (@menuid[@menu] == E10_STONES_PETAL) goto L_stones_offer_petal;
-    if (@menuid[@menu] == E10_STONES_NEVERMIND) goto L_stones_nevermind;
-    close;
-
-L_stones_offer_wisp:
-    if (countitem("WispPowder") < 1) goto L_stones_noitem;
-    delitem "WispPowder", 1;
-    goto L_stones_thanks;
-
-L_stones_offer_spectre:
-    if (countitem("SpectrePowder") < 1) goto L_stones_noitem;
-    delitem "SpectrePowder", 1;
-    goto L_stones_thanks;
-
-L_stones_offer_poltergeist:
-    if (countitem("PoltergeistPowder") < 1) goto L_stones_noitem;
-    delitem "PoltergeistPowder", 1;
-    goto L_stones_thanks;
-
-L_stones_offer_soul:
-    if (countitem("JackOSoul") < 1) goto L_stones_noitem;
-    delitem "JackOSoul", 1;
-    goto L_stones_nothanks;
-
-L_stones_offer_heart:
-    if (countitem("DiseasedHeart") < 1) goto L_stones_noitem;
-    delitem "DiseasedHeart", 1;
-    goto L_stones_thanks;
-
-L_stones_offer_ear:
-    if (countitem("UndeadEar") < 1) goto L_stones_noitem;
-    delitem "UndeadEar", 1;
-    goto L_stones_thanks;
-
-L_stones_offer_eye:
-    if (countitem("UndeadEye") < 1) goto L_stones_noitem;
-    delitem "UndeadEye", 1;
-    goto L_stones_thanks;
-
-L_stones_offer_bone:
-    if (countitem("Bone") < 1) goto L_stones_noitem;
-    delitem "Bone", 1;
-    goto L_stones_thanks;
-
-L_stones_offer_skull:
-    if (countitem("Skull") < 1) goto L_stones_noitem;
-    delitem "Skull", 1;
-    goto L_stones_thanks;
-
-L_stones_offer_crystal:
-    if (countitem("DarkCrystal") < 1) goto L_stones_noitem;
-    delitem "DarkCrystal", 1;
-    goto L_stones_thanks;
-
-L_stones_offer_rags:
-    if (countitem("RottenRags") < 1) goto L_stones_noitem;
-    delitem "RottenRags", 1;
-    goto L_stones_nothanks;
-
-L_stones_offer_petal:
-    if (countitem("DarkPetal") < 1) goto L_stones_noitem;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Let me examine it... h'm...\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Well now... this is quite... impressive.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"I think I've figured out how you came here...\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"This item will certainly serve my purposes. However, when it comes time for you to go home, you may find it a little more difficult.\"";
-    mes "\"Not impossible, but difficult.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Do you want to give it to me anyway?\"";
-    next;
-    menu
-        "I'm a tough guy, I'll still make it home.", L_stones_tough,
-        "Sorry, I'm a coward. Maybe I've got something else...", L_stones_offer;
-    close;
-
-L_stones_nevermind:
-    mes "[Doctor]";
-    mes "";
-    mes "\"H'm, well, if you come by anything please let me know!\"";
-    close;
-
-L_stones_thanks:
-    callsub S_Update_Helped;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Let me examine it... h'm...\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Yes, that should do perfectly! Thank you very much.\"";
-    next;
-    menu
-        "Is there anything else you need?", L_stones_help,
-        "Yep, that's fine. Bye then!", -;
-    close;
-
-L_stones_nothanks:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Let me examine it... h'm...\"";
-    mes "\"No, I'm afraid that won't work. Do you have anything else?\"";
-    goto L_stones_offer;
-
-L_stones_noitem:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Let me examine it... h'm...\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Wait a minute! You don't even have one of those!\"";
-    next;
-    menu
-        "Well, I did, but I dropped it halfway through the dialogue.", L_stones_dropped,
-        "Sorry, I thought I did. Let's see what else I have...", L_stones_offer,
-        "Aha! Got you all excited there!", -;
-    close;
-
-L_stones_tough:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Well, if you're sure...\"";
-    next;
-    menu
-        "I am! Just take the petal, okay?", L_give_petal,
-        "Er, actually, I'm not. Maybe I have something else...", L_stones_offer;
-    close;
-
-L_give_petal:
-    if (countitem("DarkPetal") < 1) goto L_stones_noitem;
-    delitem "DarkPetal", 1;
-    goto L_stones_thanks;
-
-L_stones_help:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Hmm, that's all for now, thank you. I'm going to have a look around this area, though, and I might need some assistance later on.\"";
-    close;
-
-L_At_Stones_Helped:
-    mes "[Doctor]";
-    mes "";
-    mes "A smile appears on the Doctor's face. \"You really have done splendidly here.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Will have to see about taking care of these other loose ends, though. Well, I should be getting back to my observations. Please feel free to let me know if you have some new information for me.\"";
-    next;
-    menu "Okay, I'll see you around!", -,
-            "Actually, I'd like to go home now. Any chance you could help?", L_Warning;
-    close;
-
-// ===================================================================
-// Helper portions, duplicated in each script for want of time, sorry.
-// ===================================================================
-
-// The player has defeated the invader and helped enough times.
-L_Return_Ready_Optional:
-    if (!(~(Easter_2010_QuestState >> E10_HELPED_DOCTOR_SHIFT) & E10_HELPED_DOCTOR_MASK) || ((Easter_2010_QuestState >> E10_HELPED_DOCTOR_STONES_SHIFT) & E10_HELPED_DOCTOR_STONES_MASK))
-        goto L_Return_Ready;
-
-    // Player can help one more time, if so desired.
-    mes "[Doctor]";
-    mes "";
-    mes "\"Well... this has been quite an adventure, hasn't it? I'd say it's about timey--er, time for me to go, but I think I can stick around for a little while longer to tie up some loose ends for myself.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, did you want to help again?\"";
-    next;
-    menu "Sure, that sounds good", L_At_Stones,
-            "Hm, I can't right now, but maybe later.", L_Return_Ready,
-            "I was looking for a way to go home.", L_Return_Capable,
-            "No, sorry, I don't think so.", L_Return_Ready;
-    close;
-
-// Player has done "everything" to do in this world, just talking to the Doctor.
-L_Return_Ready:
-    set @parting$, "!";
-    if (strcharinfo(0) == "Alonso" || strcharinfo(0) == "AlOnS") set @parting$, ", Alonso!";
-    mes "[Doctor]";
-    mes "";
-    mes "\"Well, you have been absolutely brilliant! Brilliant! Very impressive.\" He smiles kindly and shakes your hand. \"It has been a pleasure. Now for the next adventure. Allons-y" + @parting$ + "\"";
-    close;
-
-L_Defeat_Invader:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Ah-ha! It's nice to see you again. How goes the battle?\"";
-    next;
-    menu "I'm having a hard time, actually. I'd like to go home...", -,
-            "Regrouping now for the next encounter, actually.", L_Encourage;
-    goto L_Warning;
-
-L_Encourage:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, well, I think you'll prevail in the end! If you'll excuse me, I still have some things to see to.\"";
-    close;
-
-L_MidReward:
-    if (((Easter_2010_QuestState >> E10_FLAG_MID_REWARD_SHIFT) & E10_FLAG_MID_REWARD_MASK)) close;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Fantastic! You have really been quite helpful.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Er, now that I think about it, perhaps I have something you'd be interested in.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"While visiting another dimension--hm, as a matter of fact, it was quite like this one. But their choices in the past seem to have differed from the ones here...\"";
-	next;
-    mes "[Doctor]";
-    mes "";
-    mes "The Doctor reflects on his words. \"Interesting how things turn out. Well, I now have a lot of these Valentine's Glasses, if you'd like a pair.\"";
-    next;
-    getinventorylist;
-    if (@inventorylist_count == 100)
-        goto L_MidReward_NoRoom;
-    mes "[Doctor]";
-    mes "";
-    mes "He hands you the glasses.";
-    mes "\"They're not too brainy, or suited for detecting background radiation, but they are charming.\"";
-    set Easter_2010_QuestState, Easter_2010_QuestState & ~(E10_FLAG_MID_REWARD_MASK << E10_FLAG_MID_REWARD_SHIFT) | (E10_FLAG_MID_REWARD << E10_FLAG_MID_REWARD_SHIFT);
-    getitem E10_MIDREWARD_ID, 1;
-    close;
-
-L_MidReward_NoRoom:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, I don't think you have room for these. Well, I suppose I'll hold on to them for now.\"";
-    close;
-
-// Warning about the potential perils ahead, but the player must still want to abort the quest.
-L_Warning:
-    mes "[Doctor]";
-    mes "";
-    mes "\"There is no doubt in my mind that what awaits us is both powerful and dangerous, to say the least.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"If this... destruction, this disregard for life isn't an indication, what is?\"";
-    mes "He takes a moment, searching your face.";
-    next;
-    mes "[Doctor]";
-    mes "";
-    if (((Easter_2010_QuestState >> E10_HELPED_DOCTOR_SHIFT) & E10_HELPED_DOCTOR_MASK))
-        mes "\"I do appreciate your help thus far, really. And I did look forward to working with you again in putting an end to this devastation.\"";
-    if (!((Easter_2010_QuestState >> E10_HELPED_DOCTOR_SHIFT) & E10_HELPED_DOCTOR_MASK))
-        mes "\"Despite the danger, I think pressing on would certainly be a brave choice.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"But if you were to leave now, I'm afraid it would be impossible to return...\"";
-    mes "He pauses again. \"There is still time for you to turn back now, while it's relatively easy.\"";
-    next;
-    menu "N-no, I-I think I will continue... Yes, I'm ready!", -,
-            "Now that you mention it, maybe I'd better leave now while I can.", L_Turn_Back,
-            "Um, could I have a minute to think it over?", -;
-    close;
-
-L_Turn_Back:
-    mes "[Doctor]";
-    mes "";
-    mes "\"You really want to turn back now?\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"I don't think there's any shame in going back. Quite the contrary. You're brave for even being here.\"";
-    mes "He hesitates ever so slightly, choosing his words. \"I just wanted to make sure you were certain about your decision.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Once you've left, I don't see how you'll be able to return.\"";
-    next;
-    menu "On second thought, perhaps I will stick around.", -,
-            "No, no, I'm quite sure I want to leave.", L_Really_Return;
-    close;
-
-// The player definitely wants to go back, and there's no returning.
-L_Really_Return:
-    if ((Easter_2010_QuestState >> E10_FLAG_RETURN_READY_SHIFT) & E10_FLAG_RETURN_READY_MASK == E10_FLAG_RETURN_READY && (Easter_2010_QuestState >> E10_STATE_ROSE_SHIFT) & E10_STATE_ROSE_MASK == E10_STATE_ROSE_ROSE_COMPLETE)
-        goto L_Return_Capable;
-    mes "[Doctor]";
-    mes "";
-    mes "\"If that is what you want, then consider it done. And good luck.\"";
-    next;
-    goto L_Return_Player;
-
-L_Return_Player:
-    callsub S_Helped_Count;
-    if (countitem("DarkPetal") == 0 && @Easter_2010_helper < 3) goto L_Difficult_Return;
-    set Easter_2010_QuestState, (Easter_2010_QuestState & ~(E10_STATE_ROSE_MASK << E10_STATE_ROSE_SHIFT)) | (E10_STATE_ROSE_RETURNED << E10_STATE_ROSE_SHIFT);
-    if (@Easter_2010_helper < 3)
-        delitem "DarkPetal", 1;
-    savepoint "009-1", 52, 40;
-    warp "009-1", 0, 0;
-    close;
-
-L_Difficult_Return:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Hm... you don't seem to have the thing that brought you here, that petal, that I could have used to send you back... assuming you really do want to give up.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Others have been able to battle some darkness directly, which might serve as a substitute.\"";
-    mes "\"You could still help me here and elsewhere if you want to try to get this done once and for all, but if you want to go early you will need to fight, somehow.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Though there are others helping, too. No doubt that soon enough, you'll be able to go anyway...\"";
-    close;
-
-L_Return_Capable:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Hm. Oh, it looks like you've learned how to travel between these worlds on your own. Don't you remember the way?\"";
-    next;
-    menu "Oh, you're right! It was a spell, um..." + getspellinvocation("world-shift") + " was the name!", -;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Excellent! Though I suspect its effects will work best when you are closer to where you started.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"When you came to this world, where did you end up? I trust that is your origin.\"";
-    close;
-
-S_Dialogue_Knows:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, hello again... hm...\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes @responses$[rand(getarraysize(@responses$))];
-    return;
-
-S_Update_Knows:
-    // Working "name" for when he hasn't introduced himself (can be changed).
-    mes "[Mysterious Man]";
-    mes "";
-    mes @responses$[rand(getarraysize(@responses$))];
-    next;
-    set Easter_2010_QuestState, Easter_2010_QuestState & ~(E10_FLAG_KNOWS_DOCTOR_MASK << E10_FLAG_KNOWS_DOCTOR_SHIFT) | (E10_FLAG_KNOWS_DOCTOR << E10_FLAG_KNOWS_DOCTOR_SHIFT);
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, excuse me,\" he gestures. \"I'm the Doctor.\"";
-    return;
-
-S_Update_Helped:
-    set Easter_2010_QuestState, Easter_2010_QuestState & ~(E10_FLAG_HELPED_DOCTOR_STONES_MASK << E10_FLAG_HELPED_DOCTOR_STONES_SHIFT) | (E10_FLAG_HELPED_DOCTOR_STONES << E10_FLAG_HELPED_DOCTOR_STONES_SHIFT);
-    callsub S_Helped_Count;
-    if (@Easter_2010_helper == 3) set Easter_2010_QuestState, (Easter_2010_QuestState & ~(E10_STATE_ROSE_MASK << E10_STATE_ROSE_SHIFT)) | (E10_STATE_ROSE_ROSE_COMPLETE << E10_STATE_ROSE_SHIFT);
-    return;
-
-S_Helped_Count:
-    set @Easter_2010_helper, 0;
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_TREE_SHIFT) & E10_FLAG_HELPED_DOCTOR_TREE_MASK == E10_FLAG_HELPED_DOCTOR_TREE)
-        set @Easter_2010_helper, @Easter_2010_helper + 1;
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_ISLAND_SHIFT) & E10_FLAG_HELPED_DOCTOR_ISLAND_MASK == E10_FLAG_HELPED_DOCTOR_ISLAND)
-        set @Easter_2010_helper, @Easter_2010_helper + 1;
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_STONES_SHIFT) & E10_FLAG_HELPED_DOCTOR_STONES_MASK == E10_FLAG_HELPED_DOCTOR_STONES)
-        set @Easter_2010_helper, @Easter_2010_helper + 1;
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_FRUIT_SHIFT) & E10_FLAG_HELPED_DOCTOR_FRUIT_MASK == E10_FLAG_HELPED_DOCTOR_FRUIT)
-        set @Easter_2010_helper, @Easter_2010_helper + 1;
-    return;
-}
diff --git a/world/map/npc/easter/2010/Doctor4.txt b/world/map/npc/easter/2010/Doctor4.txt
deleted file mode 100644
index 3cb761e0..00000000
--- a/world/map/npc/easter/2010/Doctor4.txt
+++ /dev/null
@@ -1,784 +0,0 @@
-// Doctor 4, at the fruit trees.
-
-028-1.gat,122,72,0	script	Doctor#who4	184,{
-    // States here
-    callsub S_Helped_Count;
-    if (@Easter_2010_helper >= 2 && !((Easter_2010_QuestState >> E10_FLAG_MID_REWARD_SHIFT) & E10_FLAG_MID_REWARD_MASK))
-        goto L_MidReward;
-    if (@Easter_2010_helper == 4 && !((Easter_2010_QuestState >> E10_FLAG_RETURN_READY_SHIFT) & E10_FLAG_RETURN_READY_MASK))
-        goto L_Defeat_Invader;
-    if ((Easter_2010_QuestState >> E10_FLAG_RETURN_READY_SHIFT) & E10_FLAG_RETURN_READY_MASK == E10_FLAG_RETURN_READY && (Easter_2010_QuestState >> E10_STATE_ROSE_SHIFT) & E10_STATE_ROSE_MASK == E10_STATE_ROSE_ROSE_COMPLETE)
-        goto L_Return_Ready_Optional;
-
-// =======================
-// === Fourth location ===
-// =======================
-
-//From Freeyorp on IRC:
-//The fourth position is the only position with any serious sign of life - there are quite a lot of living trees there, packed quite densely
-//In the middle of this area, atop cliffs overlooking water, is a fruit tree
-
-L_At_Fruit:
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_FRUIT_SHIFT) & E10_FLAG_HELPED_DOCTOR_FRUIT_MASK == E10_FLAG_HELPED_DOCTOR_FRUIT)
-        goto L_At_Fruit_Helped;
-    if ((Easter_2010_QuestState >> E10_FLAG_KNOWS_DOCTOR_SHIFT) & E10_FLAG_KNOWS_DOCTOR_MASK == E10_FLAG_KNOWS_DOCTOR)
-        goto L_At_Fruit_Known;
-
-    setarray @responses$, "\"This tree... it bears remarkable signs of life for such a dead world...\"", "\"But this red light here in conjunction with the blue... that means it must be...\"", "\"Oh dear! Pressed the wrong dratted button again. I wish they'd make them just a little larger...\"", "\"But why so alive? It's surprising to find something that isn't long dead...\"";
-
-    callsub S_Update_Knows;
-    close;
-
-L_At_Fruit_Known:
-    setarray @responses$, "\"Hmm...\" He pauses. \"Ah, hello there. Could you help with a few things for a bit? Might be a bit dangerous, though...\"",
-                          "\"Hello again. Mind helping out again for a bit?\"",
-                          "He wanders around, apparently lost in thought. \"Hm. Are you able to help with something? Er, but just so that you know, it could be dangerous...\"",
-                          "\"Ah, it's you. Thanks for your help back there, by the way. There is something else, though it might be a bit dangerous, that I need help with if you don't mind?\"";
-    set @i, rand(getarraysize(@responses$) >> 1) << 1;
-    if ((Easter_2010_QuestState >> E10_DOCTOR_HELP_STATES_SHIFT) & E10_DOCTOR_HELP_STATES_MASK) set @i, @i + 1;
-    mes @responses$[@i];
-    next;
-
-L_lens_main_menu:
-    menu "What do I need to do?", L_lens_minigame_explain,
-         "Dangerous?", L_lens_minigame_dangers,
-         "Let's start!", L_lens_loop_init,
-         "I'm just looking to leave this world. Can you help?", L_Warning,
-         "Actually, I'd rather not...", -;
-    close;
-
-L_lens_minigame_explain:
-    mes "[Doctor]";
-    mes "";
-    mes "\"I need a special sort of lens, one that might be used to detect what's going on around here.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"To do this, I'll need a special concoction... but I'll need an extra set of hands, and some dark crystal - they seem to match the dark presence here quite nicely.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"We'll probably need other items as well, to get the concoction to the right state. Hm...\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    if (countitem("Pearl") < 1) mes "\"If you get some solid, shiny object that could be used in the mix, that would help. A lot.\"";
-    if (countitem("Pearl") > 0) mes "\"Your pearl there would be great in the mix, as such things help in removing color. Though adding too much would make the wrong kind of texture, and also make it difficult to see through...\"";
-    if (countitem("IronPotion") < 1) mes "\"From what I've heard about potions from your world, one of them would be excellent at removing an unwanted presence while we make this. I can't remember the name right now, but I think it was orange...\"";
-    if (countitem("IronPotion") > 0) mes "\"That orange potion there... an Iron Potion, isn't it? It looks like a fairly thick brew, but something that strong should be useful for getting rid of this presence if it gets too much.\"";
-    if (countitem("ConcentrationPotion") < 1) mes "\"If you could find some potion to refine the concoction, that should be quite useful.\"";
-    if (countitem("ConcentrationPotion") > 0) mes "\"That purple potion there... a Concentration Potion, you say? That's closer to the sort of texture we're looking for, but it might draw the attention of that presence...\"";
-    if (countitem("SlowPoisonPotion") < 1) mes "\"And any other potion you can think of, really. I just make it up as I go along, most of the time.\"";
-    if (countitem("SlowPoisonPotion") > 0) mes "\"Ah, a potion to slow the effects of poison? Interesting, interesting, perhaps something like that could also protect our mix from this evil influence.\"";
-    if (countitem("BottleOfWater") < 1) mes "\"Though you don't seem to have any water... there is water all around in this place, but whenever I try to do anything with it, things never work. I think it might be tainted here. Maybe there are other things from your world that could help?\"";
-    if (countitem("BottleOfWater") > 0) mes "\"Ah, water. That will be fantastic for getting rid of unwanted coloration and make the mixture clearer, but of course, too much of it and we'll lose the properties that I was looking for in the first place...\"";
-    next;
-    goto L_lens_main_menu;
-
-L_lens_minigame_dangers:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Well. There's some sort of malign force around here, and the things I want to do will probably draw its attention.\"";
-    next;
-    goto L_lens_main_menu;
-
-// ##### Initialise the minigame. #####
-
-L_lens_loop_init:
-
-    // Insert sanity checks here
-    if (countitem("DarkCrystal") < 1) goto L_lens_no_crystal;
-
-    set @MAX_LENS_CRYSTAL_ENERGY_INCREASE, 70;
-
-    // Texture:
-    setarray @textures$, "finely powdered", "thick", "slightly thick", "slightly thin", "thin";
-    set @textureID, rand(3);
-
-    // Coloration is more interesting. 1 for red, 2 for blue, 4 for yellow. So 7 has everything, 0 is clear.
-    setarray @tints$, "clear", "red", "blue", "purple", "yellow", "orange", "green", "dark";
-    set @tintID, rand(7);
-
-    // Opacity, final explicitly displayed value
-    setarray @opacities$, "opaque", "moderately opaque", "moderately transparent", "transparent";
-    set @opacityID, rand(2);
-
-    set @crystalEnergy, rand(rand(@MAX_LENS_CRYSTAL_ENERGY_INCREASE) + 1); // Yes, things _can_ go wrong right from the start.
-    set @dilution, 4;
-    set @rounds, 0; // Things go spectacularly wrong as time goes on.
-    set @damage, 0; // When this hits 4, game over.
-
-    mes "The Doctor places the dark crystal in a small metal container. Looking away, and shielding his face with one hand, he uses a small thin metallic device to emit a sharp, piecing sound, shattering the dark crystal.";
-    delitem "DarkCrystal", 1;
-    mes "There is a cloud of smoke, and purple flames leap from the container.";
-    next;
-
-// ----------------------
-// ===== Main loop. =====
-// ----------------------
-
-L_lens_loop_main:
-    set @retloc, 0;
-    set @oldtextureID, @textureID;
-    set @oldtintID, @tintID;
-    set @oldopacityID, @opacityID;
-
-    mes "[Lens concoction]";
-    mes "";
-    mes "The concoction is currently a " + @textures$[@textureID] + ", " + @tints$[@tintID] + " " + @opacities$[@opacityID] + " concoction.";
-    set @mod, 0;
-    if (rand(@crystalEnergy) / 3 + rand(@crystalEnergy >> 1) > 30) set @mod, 1;
-    if (@mod == 1) mes "The Doctor seems uneasy. \"We seem to have drawn the attention of something. Be careful...\"";
-    next;
-
-L_lens_loop_menu:
-    set @LENS_CHOICE_PEARL, 0;
-    set @LENS_CHOICE_IRON_POTION, 1;
-    set @LENS_CHOICE_CONC_POTION, 2;
-    set @LENS_CHOICE_SLOW_POISON_POTION, 3;
-    set @LENS_CHOICE_WATER, 4;
-    set @LENS_CHOICE_WAIT, 5;
-    set @LENS_CHOICE_DISCARD, 6;
-
-    setarray @lensmenu$, "", "", "", "", "", "", "";
-    set @lensmenuiter, 0;
-
-    if (countitem("Pearl") < 1) goto L_lens_loop_post_pearl_choice;
-
-    set @lensmenu$[@lensmenuiter], "Pearl";
-    set @lensmenuID[@lensmenuiter], @LENS_CHOICE_PEARL;
-    set @lensmenuiter, @lensmenuiter + 1;
-
-L_lens_loop_post_pearl_choice:
-    if (countitem("IronPotion") < 1) goto L_lens_loop_post_iron_potion_choice;
-
-    set @lensmenu$[@lensmenuiter], "Iron potion";
-    set @lensmenuID[@lensmenuiter], @LENS_CHOICE_IRON_POTION;
-    set @lensmenuiter, @lensmenuiter + 1;
-
-L_lens_loop_post_iron_potion_choice:
-    if (countitem("ConcentrationPotion") < 1) goto L_lens_loop_post_conc_potion_choice;
-
-    set @lensmenu$[@lensmenuiter], "Concentration potion";
-    set @lensmenuID[@lensmenuiter], @LENS_CHOICE_CONC_POTION;
-    set @lensmenuiter, @lensmenuiter + 1;
-
-L_lens_loop_post_conc_potion_choice:
-    if (countitem("SlowPoisonPotion") < 1) goto L_lens_loop_post_slow_poison_potion_choice;
-
-    set @lensmenu$[@lensmenuiter], "Slow poison potion";
-    set @lensmenuID[@lensmenuiter], @LENS_CHOICE_SLOW_POISON_POTION;
-    set @lensmenuiter, @lensmenuiter + 1;
-
-L_lens_loop_post_slow_poison_potion_choice:
-    if (countitem("BottleOfWater") < 1) goto L_lens_loop_post_water_choice;
-
-    set @lensmenu$[@lensmenuiter], "Bottle of Water";
-    set @lensmenuID[@lensmenuiter], @LENS_CHOICE_WATER;
-    set @lensmenuiter, @lensmenuiter + 1;
-
-L_lens_loop_post_water_choice:
-    set @lensmenu$[@lensmenuiter], "Wait for a moment";
-    set @lensmenuID[@lensmenuiter], @LENS_CHOICE_WAIT;
-    set @lensmenuiter, @lensmenuiter + 1;
-
-    set @lensmenu$[@lensmenuiter], "Discard the brew";
-    set @lensmenuID[@lensmenuiter], @LENS_CHOICE_DISCARD;
-    set @lensmenuiter, @lensmenuiter + 1;
-
-    menu @lensmenu$[0], -,
-         @lensmenu$[1], -,
-         @lensmenu$[2], -,
-         @lensmenu$[3], -,
-         @lensmenu$[4], -,
-         @lensmenu$[5], -,
-         @lensmenu$[6], -;
-
-    set @menu, @menu - 1;
-    set @pcmod, 0;
-    if (@menu >= @lensmenuiter) goto L_lens_loop_menu_invalid;
-
-    if (@lensmenuID[@menu] == @LENS_CHOICE_PEARL) goto L_lens_pc_use_pearl; // set @pcmod, rand(2);
-    if (@lensmenuID[@menu] == @LENS_CHOICE_IRON_POTION) goto L_lens_pc_use_ironpot;
-    if (@lensmenuID[@menu] == @LENS_CHOICE_CONC_POTION) goto L_lens_pc_use_concpot;
-    if (@lensmenuID[@menu] == @LENS_CHOICE_SLOW_POISON_POTION) goto L_lens_pc_use_slowpoisonpot;
-    if (@lensmenuID[@menu] == @LENS_CHOICE_WATER) goto L_lens_pc_use_water;
-    if (@lensmenuID[@menu] == @LENS_CHOICE_WAIT) set @pcmod, 6;
-    if (@lensmenuID[@menu] == @LENS_CHOICE_DISCARD) goto L_lens_discard_confirm;
-
-L_lens_loop_automodify:
-    set @rounds, @rounds + 1;
-    if (@crystalEnergy < 0) set @crystalEnergy, 0;
-    set @inc, rand(rand(@MAX_LENS_CRYSTAL_ENERGY_INCREASE / (1+(@crystalEnergy >> 2))) + 1);
-    if (!(@pcmod & 1)) set @crystalEnergy, @crystalEnergy + @MAX_LENS_CRYSTAL_ENERGY_INCREASE * @inc / (2 + @inc);
-    set @crystalEnergy, @crystalEnergy - rand(rand(@MAX_LENS_CRYSTAL_ENERGY_INCREASE) + 1);
-    if (@crystalEnergy < 0) set @crystalEnergy, 0;
-    set @effects, rand(20 + rand(40 + @crystalEnergy));
-
-    if (!(@effects & 1)) goto L_lens_loop_automodify_post_texture;
-
-// --- Automatically modify the texture ---
-    if (@textureID == 0) set @retloc, 1;
-    if (@textureID == 0) goto L_lens_auto_alter_texture_dry;
-L_lens_loop_automodify_ret:
-    set @mod, rand(3);
-    if (@mod == 1) goto L_lens_loop_post_automods;
-    set @textureID, @textureID - 1 + @mod;
-    goto L_lens_loop_automodify_post_texture;
-
-L_lens_loop_automodify_post_texture:
-    if (@effects & 2) goto L_lens_auto_alter_color;
-L_lens_loop_auto_post_color:
-    if (@effects & 4) goto L_lens_auto_alter_transparency;
-L_lens_loop_auto_post_transparency:
-    if (@effects > 50) goto L_lens_warp_pc_hair;
-L_lens_loop_auto_post_warp_hair:
-    if (@effects > @crystalEnergy) goto L_lens_autofix_texture;
-L_lens_loop_auto_post_fix_texture:
-    set @temp, 0;
-    if (!(@effects < 65 && rand(@dilution) < 2 && (@effects & 7))) set @temp, 1;
-    if (@temp == 1) set @retloc, 2;
-    if (@temp == 1) goto L_lens_drydamage;
-L_lens_loop_auto_post_drydamage:
-    set @temp, 0;
-    if ((@effects + @crystalEnergy / 3 > 85 || (@textureID == 0 && rand(@effects + @crystalEnergy) > 30)) && (!(@pcmod & 1) || @pcmod & 2)) set @temp, 1;
-    if (@temp == 1) set @retloc, 3;
-    if (@temp == 1) goto L_lens_directdamage;
-    set @temp, 0;
-
-L_lens_loop_post_automods:
-    if (@oldtintID & (@tintID ^ @oldtintID)) mes "The mixture becomes less " + @tints$[@oldtintID & (@tintID ^ @oldtintID)] + ", changing to a " + @tints$[@oldtintID & ~(@oldtintID & (@tintID ^ @oldtintID))] + " tint.";
-    if (@tintID & (@tintID ^ @oldtintID)) mes "The mixture becomes more " + @tints$[@tintID & (@tintID ^ @oldtintID)] + ", changing to a " + @tints$[@tintID] + " tint.";
-    if (@textureID == @oldtextureID) goto L_lens_nochange_texture;
-    if (@textureID < 0) set @textureID, 0;
-    if (@textureID > 4) set @textureID, 4;
-    if (@oldtextureID == 0) mes "The powder becomes more fluid, changing into a " +   @textures$[@textureID] + " concoction.";
-    if (@oldtextureID > @textureID) mes "The concoction thickens, changing into a " + @textures$[@textureID] + " concoction.";
-    if (@oldtextureID < @textureID && !(@oldtextureID == 0)) mes "The concoction thins, changing into a " + @textures$[@textureID] + " concoction.";
-
-L_lens_nochange_texture:
-    if (@oldopacityID > @opacityID) mes "The concoction becomes more opaque.";
-    if (@oldopacityID < @opacityID) mes "The concoction becomes more transparent.";
-
-L_lens_loop_check:
-    // Check to whether you finished here
-    if ((@textureID == 3 || @textureID == 2) && @tintID == 0 && @opacityID == 0 && @rounds < 3) goto L_lens_early;
-    if ((@textureID == 3 || @textureID == 2) && @tintID == 0 && @opacityID == 0) goto L_lens_complete;
-    if (@textureID == 0 && (@rounds + 36) / (@dilution + 5) > 4) goto L_lens_dry_destroyed;
-    if ((@damage > 3 && @crystalEnergy > 80) || (@damage > 2 && @crystalEnergy > 80 && @textureID == 0)) goto L_lens_violently_destroyed;
-    next;
-    goto L_lens_loop_main;
-
-L_lens_early:
-    mes "[Doctor]";
-    mes "";
-    mes "\"That's the sort of thing I'm aiming for - too bad that we haven't added enough for it to complete, though.\"";
-    next;
-    goto L_lens_loop_main;
-
-L_lens_discard_confirm:
-    // Make sure that the player really does want to discard the mix.
-    mes "[Doctor]";
-    mes "";
-    if (@mod == 1 && @damage < 2) mes "\"Are you sure? It didn't seem so bad before...\"";
-    if (@mod == 0 || @damage > 1) mes "\"If you are sure... there's a lot of dark energy around, so that might be the best option...\"";
-    next;
-    menu "Yes, get rid of it!", L_lens_really_discard,
-         "No, on second thoughts, better not...", -;
-    goto L_lens_loop_menu;
-
-L_lens_really_discard:
-    mes "The Doctor takes out a curious glass instrument, and carefully moves it over the mixture. The device takes on a sickly purple hue, and the remnants of the mixture crumbles into nothingness as the light fades into the device.";
-    close;
-
-L_lens_loop_menu_invalid:
-    mes "[Lens concoction]";
-    mes "That doesn't seem right, somehow...";
-    next;
-    goto L_lens_loop_menu;
-
-L_lens_pc_use_pearl:
-    if (countitem("Pearl") < 1) goto L_lens_pc_use_missing;
-    delitem "Pearl", 1;
-    mes "You pass the pearl to the Doctor, who awkwardly takes it with one hand, grinds it into powder with another device, all the while keeping the container firmly in place. After he finishes, you sprinkle the powder evenly over the concoction.";
-    if (@textureID > 1) set @textureID, @textureID - 1;
-    if (rand(3 * (@rounds + 6) / (@dilution + 2)) > 0) set @tintID, @tintID & ~1; // Remove red
-    if (rand(2) > 0) set @tintID, @tintID & ~2; // Remove blue
-    if (rand(3) > 0) set @tintID, @tintID & ~4; // Remove yellow
-    if (rand(@opacityID) == 0) set @opacityID, @opacityID + 1;
-    goto L_lens_loop_automodify;
-
-L_lens_pc_use_ironpot:
-    if (countitem("IronPotion") < 1) goto L_lens_pc_use_missing;
-    delitem "IronPotion", 1;
-    mes "You pour the iron potion into the mix.";
-    if (@textureID > 2) set @textureID, @textureID - 1;
-    if (@textureID == 1 || (@textureID == 0 && rand(2) == 0)) set @textureID, @textureID + 1;
-    set @tintID, @tintID | 4;
-    if (rand(3) > 0) set @tintID, @tintID | 1;
-    set @crystalEnergy, 10 * (@crystalEnergy + 5) >> 4;
-    goto L_lens_loop_automodify;
-
-L_lens_pc_use_concpot:
-    if (countitem("ConcentrationPotion") < 1) goto L_lens_pc_use_missing;
-    delitem "ConcentrationPotion", 1;
-    mes "You pour the concentration potion into the mix.";
-    if (@textureID > 1 && rand(5) <= 2) set @textureID, @textureID - 1;
-    if (@textureID == 0 && rand(3) > 0) set @textureID, @textureID + 1;
-    set @pcmod, rand(2);
-    goto L_lens_loop_automodify;
-
-L_lens_pc_use_slowpoisonpot:
-    if (countitem("SlowPoisonPotion") < 1) goto L_lens_pc_use_missing;
-    delitem "SlowPoisonPotion", 1;
-    mes "You pour the slow poison potion into the mix.";
-    if ((@textureID < 4 && @textureID > 0 && rand(5) > 2) || (@textureID == 0 && rand(5))) set @textureID, @textureID + 1;
-    set @crystalEnergy, @crystalEnergy - rand(rand(10 * (@crystalEnergy + 15) >> 4) + 5);
-    set @pcmod, 1;
-    goto L_lens_loop_automodify;
-
-L_lens_pc_use_water:
-    if (countitem("BottleOfWater") < 1) goto L_lens_pc_use_missing;
-    delitem "BottleOfWater", 1;
-    mes "You empty the bottle of water into the mix.";
-    if ((@textureID < 4 && @textureID > 0) || (@textureID == 0 && rand(5) < 2)) set @textureID, @textureID + 1;
-    if (rand(7) < 2) set @tintID, @tintID & ~3;
-    if (rand(7) < 2) set @tintID, @tintID & ~5;
-    if (rand(7) < 2) set @tintID, @tintID & ~6;
-    if (rand(@opacityID + 2) > 1) set @opacityID, @opacityID - 1;
-    set @pcmod, rand(3);
-    set @dilution, @dilution + 1;
-    goto L_lens_loop_automodify;
-
-L_lens_pc_use_missing:
-    mes "Odd, you seemed to have it just moments before. Somewhat confused, you go back to consider what to do next.";
-    next;
-    goto L_lens_loop_menu;
-
-// -----------------------------------------------------------------
-// ##### The various automatic subroutines for various effects #####
-// -----------------------------------------------------------------
-
-L_lens_auto_alter_color:
-    set @mod, 1 << rand(3);
-    if (rand(@crystalEnergy) > 40) set @mod, @mod | 4;
-    if (@crystalEnergy - rand(@crystalEnergy) < 30) set @mod, @mod | rand(3);
-    set @tintID, @tintID | @mod;
-    goto L_lens_loop_auto_post_color;
-
-L_lens_auto_alter_transparency:
-    set @mod, rand(3);
-    if ((@opacityID == 0 && @mod < 1) || (@opacityID == 3 && @mod > 1)) goto L_lens_loop_auto_post_transparency;
-    if (@mod == 1) goto L_lens_loop_auto_post_transparency;
-    set @opacityID, @opacityID - 1 + @mod;
-    if (@mod > 1) mes "The mixture alters, and becomes easier to see through.";
-    if (@opacityID == 3) mes "The mixture is now completely clear.";
-    if (@mod < 1) mes "The mixture alters, and becomes harder to see through.";
-    goto L_lens_loop_auto_post_transparency;
-
-L_lens_warp_pc_hair:
-    mes "You feel something around your head change...";
-    set @style,rand(6);
-    set @color,rand(9);
-    setlook 1,@style+1;
-    setlook 6,@color;
-    goto L_lens_loop_auto_post_warp_hair;
-
-L_lens_autofix_texture:
-    set @textureID, @textureID + rand(3) - 1;
-    if (@textureID > 3) set @textureID, @textureID -1;
-    if (@textureID < 3) set @textureID, @textureID +1;
-    goto L_lens_loop_auto_post_fix_texture;
-
-L_lens_directdamage:
-    mes "A flash of sickly yellow light blinds you, the mixture distorts for a moment, then reappears.";
-    set @textureID, rand(3);
-    set @tintID, @tintID | rand(7);
-    set @opacityID, 0;
-
-    set @mod, 0;
-    if (rand(readparam(bAgi)) > 30) set @mod, 1;
-    if (@mod == 1) mes "You barely manage to dive out of the way as the yellow flash sharply hisses through a space which, until a few moments ago, you had occupied...";
-    if (@mod == 0) mes "The light burns all around you, with a strong sensation as if you were crushed under a great weight...";
-    if (@mod == 0) itemheal readparam(bVit) * readparam(bVit) / 12 - 820, 0;
-    if (Hp < 1) close;
-    set @mod, 1;
-
-L_lens_auto_alter_texture_dry:
-    // If the mix dries up, and too much of the mix was water, then the mixture become damaged. However, the chance that it does dry up decreases with the proportion of water used so far
-    if (@mod == 0 && rand(2) == 0 && @dilution > 4) set @dilution, @dilution - 1;
-    if (rand(3) == 0 && @dilution > 5 && rand(@dilution * @dilution) > 12 && (!@pcmod & 1)) goto L_lens_drydamage;
-    goto L_lens_loop_return_fix;
-
-L_lens_drydamage:
-    if (@mod == 0 && @pcmod & 1) goto L_lens_loop_return_fix;
-    if (@mod == 0) mes "With a flash of purple light, the mixture spontaneously becomes very dry.";
-    if (@mod == 0 && rand(2) == 0 && @dilution > 5) set @dilution, @dilution / 2;
-    if (@mod == 0) set @textureID, 0;
-
-L_lens_damagelens:
-    if (rand(@damage * @damage) >= 6) goto L_lens_loop_return_fix;
-    set @damage, @damage + 1;
-    if (@damage == 1) mes "The container starts vibrating slightly.";
-    if (@damage == 2) mes "The container begins to shake unsteadily.";
-    if (@damage == 3 && @textureID == 0) goto L_lens_violently_destroyed;
-    if (@damage == 3) mes "The container is now shaking violently. The concoction gives off an acrid smell, and dark purple sparks occasionally fly out of the container. He watches you uneasily.";
-    if (@damage == 4) goto L_lens_violently_destroyed;
-    goto L_lens_loop_return_fix;
-
-L_lens_loop_return_fix:
-    if (@retloc == 0) mes "FATAL ERROR: @retloc undefined in L_lens_loop_return_fix, closing script.";
-    if (@retloc == 0) close;
-    // Hacky.
-    set @temp, 0;
-    if (@retloc == 1) set @temp, 1;
-    if (@retloc == 2) set @temp, 2;
-    if (@retloc == 3) set @temp, 3;
-    set @retloc, 0;
-    if (@temp == 0) mes "FATAL ERROR: @retloc out of range in L_lens_loop_return_fix, closing script.";
-    if (@temp == 0) close;
-    if (@temp == 1) goto L_lens_loop_automodify_ret;
-    if (@temp == 2) goto L_lens_loop_auto_post_drydamage;
-    if (@temp == 3) goto L_lens_loop_post_automods;
-
-L_lens_no_crystal:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Looks like neither of us have a dark crystal. I'll try something else, but if you want to look around for one in the meantime, we could try again later.\"";
-    close;
-
-// ---------------------------------
-// ##### The possible outcomes #####
-// ---------------------------------
-
-L_lens_violently_destroyed:
-    mes "A high pitched whine echoes around you. A series of blinding flashes force you to cover your eyes as the container is sent flying into the air. The grass around where the concoction landed takes on a sickly yellow hue.";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "The Doctor sighs.";
-    mes "\"That could have gone better...\"";
-    next;
-    mes "The Doctor takes out a curious glass device, and carefully moves it over the tainted grass. Purple and black energies are sucked into the device, and the grass gradually returns to its normal color.";
-    close;
-
-L_lens_dry_destroyed:
-    mes "[Doctor]";
-    mes "";
-    mes "The Doctor frowns.";
-    mes "";
-    mes "\"It's has become too dry... I fear that the mix has become damaged beyond repair, at least for the purposes I had in mind...";
-    mes "I'll do what I can to salvage what is there, but it would be unrealistic to be expect that the end result will be anything other than deeply flawed.\"";
-
-L_lens_salvage:
-    mes "[Doctor]";
-    mes "";
-    mes "The Doctor takes out a vial containing a crystal clear fluid, an oddly shaped bowl, and a curious glass device. He then tips the remnants of the concoction into the bowl, then moves the device counterclockwise around the bowl five times, while pouring the clear fluid into the bowl";
-    mes "A weak yellow glow surrounds the device as it moves around the outside of the bowl, and the concoction slowly fuses together as more of the clear fluid is added to it. But the concoction is still very lumpy, and doesn't fit properly within the bowl.";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "He mutters distractedly as he moves the device directly over the bowl, then around, twice clockwise then once counterclockwise. \"...all going wrong... shouldn't be yellow...\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "He then holds the device vertically over the bowl, and takes out a vial of bright red fluid, inverts the device, and mixes the red fluid into the dark purple energy that shoots out of the device into the centre of the remnants.";
-    mes "The red fluid darkens the energy it comes into contact with, then spreads out over the remnants of the concoction, giving of copious amounts of smoke.";
-    next;
-
-    mes "[Doctor]";
-    mes "";
-    mes "After a few moments, he steps back and puts away the vial and the glass device, which is now completely devoid of any color.";
-    mes "The smoke gradually clears, leaving a perceptively warped lump of glass in the middle.";
-
-    mes "[Doctor]";
-    mes "";
-    mes "\"You might as well take this.\"";
-    mes "";
-    mes "\"I did what I could, but the lens is still warped beyond use, for me... I'm not sure that there's much that you'll be able to do with that as it is, but perhaps you could find someone that still has a use for it somewhere, or something.\"";
-    getitem "FlawedLens", 1;
-    close;
-
-L_lens_complete:
-    mes "The Doctor grins broadly.";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Yes, yes. That's it, that's just what I need!\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "The Doctor takes out an oddly shaped bowl and a curious glass device. He quickly pours the concoction in, then moves the device over the bowl. A faint blue glow surrounds the bowl as he does so.";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "He then moves the device around the edges, twice clockwise then once counterclockwise.";
-    mes "After this, he holds the device vertically over the bowl. He takes out a vial of bright red fluid, and inverts the device, sending a stream of pure black energy directly downwards into the concoction. He moves with incredible speed as he pours the red fluid evenly over the concoction as the black energy hits the concoction, giving off a tremendous amount of steam.";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "He stares at the bowl with intense concentration, then abruptly cuts off the stream of red fluid, despite no visible change in the mixture that you can see through the steam.";
-    next;
-    mes "As the steam clears, you see that the concoction has hardened into a single solid shape, smoothly curving outwards, but completely opaque.";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Nothing to worry about.. it might be opaque now, but give it a moment to cool down first. Ah, there, it's clearing up nicely now.\"";
-    mes "";
-    mes "He waits a moment, as the lens becomes more and more transparent.";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "The Doctor carefully picks up the lens and holds it in a small piece of fabric. He turns it over a few times, checking to make sure there aren't any imperfections.";
-    mes "";
-    mes "\"The glass formed perfectly! The lens is done.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"This is just what I needed. You were a great help, thank you!\"";
-    mes "";
-    mes "[You gain 150,000 experience points!]";
-    getexp 150000, 0;
-    callsub S_Update_Helped;
-    close;
-    // Yay!
-
-L_At_Fruit_Helped:
-    mes "As you approach, you see him looking through a collection of devices.";
-    next;
-    mes "There is an odd humming sound, and a blue glow from somewhere.";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, hello.\" You notice the sound has stopped. \"Ah, and thanks for the help back there, I should be able to get this done in no time now.\"";
-    mes "He wanders around, and you can see him do something complicated with yet another of his devices and the lens that you made.";
-    next;
-    mes "You can't be quite sure, but this area feels healthier already...";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Brilliant! If there's anything else I will let you know, if that's all right?\"";
-    next;
-    menu "Okay, I'll see you around!", -,
-            "Actually, I'd like to go home now. Any chance you could help?", L_Warning;
-    close;
-
-// ===================================================================
-// Helper portions, duplicated in each script for want of time, sorry.
-// ===================================================================
-
-// The player has defeated the invader and helped enough times.
-L_Return_Ready_Optional:
-    if (!(~(Easter_2010_QuestState >> E10_HELPED_DOCTOR_SHIFT) & E10_HELPED_DOCTOR_MASK) || ((Easter_2010_QuestState >> E10_HELPED_DOCTOR_FRUIT_SHIFT) & E10_HELPED_DOCTOR_FRUIT_MASK))
-        goto L_Return_Ready;
-
-    // Player can help one more time, if so desired.
-    mes "[Doctor]";
-    mes "";
-    mes "\"Well... this has been quite an adventure, hasn't it? I'd say it's about timey--er, time for me to go, but I think I can stick around for a little while longer to tie up some loose ends for myself.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, did you want to help again?\"";
-    next;
-    menu "Sure, that sounds good", L_At_Fruit,
-            "Hm, I can't right now, but maybe later.", L_Return_Ready,
-            "I was looking for a way to go home.", L_Return_Capable,
-            "No, sorry, I don't think so.", L_Return_Ready;
-    close;
-
-// Player has done "everything" to do in this world, just talking to the Doctor.
-L_Return_Ready:
-    set @parting$, "!";
-    if (strcharinfo(0) == "Alonso" || strcharinfo(0) == "AlOnS") set @parting$, ", Alonso!";
-    mes "[Doctor]";
-    mes "";
-    mes "\"Well, you have been absolutely brilliant! Brilliant! Very impressive.\" He smiles kindly and shakes your hand. \"It has been a pleasure. Now for the next adventure. Allons-y" + @parting$ + "\"";
-    close;
-
-L_Defeat_Invader:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Ah-ha! It's nice to see you again. How goes the battle?\"";
-    next;
-    menu "I'm having a hard time, actually. I'd like to go home...", -,
-            "Regrouping now for the next encounter, actually.", L_Encourage;
-    goto L_Warning;
-
-L_Encourage:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, well, I think you'll prevail in the end! If you'll excuse me, I still have some things to see to.\"";
-    close;
-
-L_MidReward:
-    if (((Easter_2010_QuestState >> E10_FLAG_MID_REWARD_SHIFT) & E10_FLAG_MID_REWARD_MASK)) close;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Fantastic! You have really been quite helpful.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Er, now that I think about it, perhaps I have something you'd be interested in.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"While visiting another dimension--hm, as a matter of fact, it was quite like this one. But their choices in the past seem to have differed from the ones here...\"";
-	next;
-    mes "[Doctor]";
-    mes "";
-    mes "The Doctor reflects on his words. \"Interesting how things turn out. Well, I now have a lot of these Valentine's Glasses, if you'd like a pair.\"";
-    next;
-    getinventorylist;
-    if (@inventorylist_count == 100)
-        goto L_MidReward_NoRoom;
-    mes "[Doctor]";
-    mes "";
-    mes "He hands you the glasses.";
-    mes "\"They're not too brainy, or suited for detecting background radiation, but they are charming.\"";
-    set Easter_2010_QuestState, Easter_2010_QuestState & ~(E10_FLAG_MID_REWARD_MASK << E10_FLAG_MID_REWARD_SHIFT) | (E10_FLAG_MID_REWARD << E10_FLAG_MID_REWARD_SHIFT);
-    getitem E10_MIDREWARD_ID, 1;
-    close;
-
-L_MidReward_NoRoom:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, I don't think you have room for these. Well, I suppose I'll hold on to them for now.\"";
-    close;
-
-// Warning about the potential perils ahead, but the player must still want to abort the quest.
-L_Warning:
-    mes "[Doctor]";
-    mes "";
-    mes "\"There is no doubt in my mind that what awaits us is both powerful and dangerous, to say the least.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"If this... destruction, this disregard for life isn't an indication, what is?\"";
-    mes "He takes a moment, searching your face.";
-    next;
-    mes "[Doctor]";
-    mes "";
-    if (((Easter_2010_QuestState >> E10_HELPED_DOCTOR_SHIFT) & E10_HELPED_DOCTOR_MASK))
-        mes "\"I do appreciate your help thus far, really. And I did look forward to working with you again in putting an end to this devastation.\"";
-    if (!((Easter_2010_QuestState >> E10_HELPED_DOCTOR_SHIFT) & E10_HELPED_DOCTOR_MASK))
-        mes "\"Despite the danger, I think pressing on would certainly be a brave choice.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"But if you were to leave now, I'm afraid it would be impossible to return...\"";
-    mes "He pauses again. \"There is still time for you to turn back now, while it's relatively easy.\"";
-    next;
-    menu "N-no, I-I think I will continue... Yes, I'm ready!", -,
-            "Now that you mention it, maybe I'd better leave now while I can.", L_Turn_Back,
-            "Um, could I have a minute to think it over?", -;
-    close;
-
-L_Turn_Back:
-    mes "[Doctor]";
-    mes "";
-    mes "\"You really want to turn back now?\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"I don't think there's any shame in going back. Quite the contrary. You're brave for even being here.\"";
-    mes "He hesitates ever so slightly, choosing his words. \"I just wanted to make sure you were certain about your decision.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Once you've left, I don't see how you'll be able to return.\"";
-    next;
-    menu "On second thought, perhaps I will stick around.", -,
-            "No, no, I'm quite sure I want to leave.", L_Really_Return;
-    close;
-
-// The player definitely wants to go back, and there's no returning.
-L_Really_Return:
-    if ((Easter_2010_QuestState >> E10_FLAG_RETURN_READY_SHIFT) & E10_FLAG_RETURN_READY_MASK == E10_FLAG_RETURN_READY && (Easter_2010_QuestState >> E10_STATE_ROSE_SHIFT) & E10_STATE_ROSE_MASK == E10_STATE_ROSE_ROSE_COMPLETE)
-        goto L_Return_Capable;
-    mes "[Doctor]";
-    mes "";
-    mes "\"If that is what you want, then consider it done. And good luck.\"";
-    next;
-    goto L_Return_Player;
-
-L_Return_Player:
-    callsub S_Helped_Count;
-    if (countitem("DarkPetal") == 0 && @Easter_2010_helper < 3) goto L_Difficult_Return;
-    set Easter_2010_QuestState, (Easter_2010_QuestState & ~(E10_STATE_ROSE_MASK << E10_STATE_ROSE_SHIFT)) | (E10_STATE_ROSE_RETURNED << E10_STATE_ROSE_SHIFT);
-    if (@Easter_2010_helper < 3)
-        delitem "DarkPetal", 1;
-    savepoint "009-1", 52, 40;
-    warp "009-1", 0, 0;
-    close;
-
-L_Difficult_Return:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Hm... you don't seem to have the thing that brought you here, that petal, that I could have used to send you back... assuming you really do want to give up.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Others have been able to battle some darkness directly, which might serve as a substitute.\"";
-    mes "\"You could still help me here and elsewhere if you want to try to get this done once and for all, but if you want to go early you will need to fight, somehow.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Though there are others helping, too. No doubt that soon enough, you'll be able to go anyway...\"";
-    close;
-
-L_Return_Capable:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Hm. Oh, it looks like you've learned how to travel between these worlds on your own. Don't you remember the way?\"";
-    next;
-    menu "Oh, you're right! It was a spell, um..." + getspellinvocation("world-shift") + " was the name!", -;
-    mes "[Doctor]";
-    mes "";
-    mes "\"Excellent! Though I suspect its effects will work best when you are closer to where you started.\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes "\"When you came to this world, where did you end up? I trust that is your origin.\"";
-    close;
-
-S_Dialogue_Knows:
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, hello again... hm...\"";
-    next;
-    mes "[Doctor]";
-    mes "";
-    mes @responses$[rand(getarraysize(@responses$))];
-    return;
-
-S_Update_Knows:
-    // Working "name" for when he hasn't introduced himself (can be changed).
-    mes "[Mysterious Man]";
-    mes "";
-    mes @responses$[rand(getarraysize(@responses$))];
-    next;
-    set Easter_2010_QuestState, Easter_2010_QuestState & ~(E10_FLAG_KNOWS_DOCTOR_MASK << E10_FLAG_KNOWS_DOCTOR_SHIFT) | (E10_FLAG_KNOWS_DOCTOR << E10_FLAG_KNOWS_DOCTOR_SHIFT);
-    mes "[Doctor]";
-    mes "";
-    mes "\"Oh, excuse me,\" he gestures. \"I'm the Doctor.\"";
-    return;
-
-S_Update_Helped:
-    set Easter_2010_QuestState, Easter_2010_QuestState & ~(E10_FLAG_HELPED_DOCTOR_FRUIT_MASK << E10_FLAG_HELPED_DOCTOR_FRUIT_SHIFT) | (E10_FLAG_HELPED_DOCTOR_FRUIT << E10_FLAG_HELPED_DOCTOR_FRUIT_SHIFT);
-    callsub S_Helped_Count;
-    if (@Easter_2010_helper == 3) set Easter_2010_QuestState, (Easter_2010_QuestState & ~(E10_STATE_ROSE_MASK << E10_STATE_ROSE_SHIFT)) | (E10_STATE_ROSE_ROSE_COMPLETE << E10_STATE_ROSE_SHIFT);
-    return;
-
-S_Helped_Count:
-    set @Easter_2010_helper, 0;
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_TREE_SHIFT) & E10_FLAG_HELPED_DOCTOR_TREE_MASK == E10_FLAG_HELPED_DOCTOR_TREE)
-        set @Easter_2010_helper, @Easter_2010_helper + 1;
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_ISLAND_SHIFT) & E10_FLAG_HELPED_DOCTOR_ISLAND_MASK == E10_FLAG_HELPED_DOCTOR_ISLAND)
-        set @Easter_2010_helper, @Easter_2010_helper + 1;
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_STONES_SHIFT) & E10_FLAG_HELPED_DOCTOR_STONES_MASK == E10_FLAG_HELPED_DOCTOR_STONES)
-        set @Easter_2010_helper, @Easter_2010_helper + 1;
-    if ((Easter_2010_QuestState >> E10_FLAG_HELPED_DOCTOR_FRUIT_SHIFT) & E10_FLAG_HELPED_DOCTOR_FRUIT_MASK == E10_FLAG_HELPED_DOCTOR_FRUIT)
-        set @Easter_2010_helper, @Easter_2010_helper + 1;
-    return;
-}
diff --git a/world/map/npc/easter/2010/_import.txt b/world/map/npc/easter/2010/_import.txt
deleted file mode 100644
index 1f543006..00000000
--- a/world/map/npc/easter/2010/_import.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-npc: npc/easter/2010/egg_func.txt
-npc: npc/easter/2010/eggs.txt
-npc: npc/easter/2010/helper.txt
diff --git a/world/map/npc/easter/2010/egg_func.txt b/world/map/npc/easter/2010/egg_func.txt
deleted file mode 100644
index 9dbf669e..00000000
--- a/world/map/npc/easter/2010/egg_func.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-function	script	Easter2010Loc_Check1	{
-    set @result,  ~Easter_2010_EggState1 & (1 << @obj) &  $Easter_2010_Egg_Loc_State1;
-    if (@result == 0) goto L_NotHere;
-    getinventorylist;
-    if (@inventorylist_count == 100 && countitem(E10_COLLECT_EGGS_ID) == 0)
-        goto L_TooMany;
-    if (rand(10)) set $Easter_2010_Egg_Loc_State1, $Easter_2010_Egg_Loc_State1  & ~(1 << @obj);
-    set Easter_2010_EggState1, Easter_2010_EggState1 | (1 << @obj);
-    mes "You pick up an egg.";
-    getitem E10_COLLECT_EGGS_ID, 1;
-    return;
-
-L_NotHere:
-    mes "You can't find an egg here.";
-    set @result, 0;
-    return;
-
-L_TooMany:
-    mes "You don't have room for this egg.";
-    set @result, 0;
-    return;
-}
-
-function	script	Easter2010Loc_Check2	{
-    set @result,  ~Easter_2010_EggState2 & (1 << @obj) &  $Easter_2010_Egg_Loc_State2;
-    if (@result == 0) goto L_NotHere;
-    getinventorylist;
-    if (@inventorylist_count == 100 && countitem(E10_COLLECT_EGGS_ID) == 0)
-        goto L_TooMany;
-    if (rand(10)) set $Easter_2010_Egg_Loc_State2, $Easter_2010_Egg_Loc_State2  & ~(1 << @obj);
-    set Easter_2010_EggState2, Easter_2010_EggState2 | (1 << @obj);
-    mes "You pick up an egg.";
-    getitem E10_COLLECT_EGGS_ID, 1;
-    return;
-
-L_NotHere:
-    mes "You can't find an egg here.";
-    set @result, 0;
-    return;
-
-L_TooMany:
-    mes "You don't have room for this egg.";
-    set @result, 0;
-    return;
-}
-
-function	script	Easter2010Loc_Check3	{
-    set @result, ~Easter_2010_EggState3 & (1 << @obj) &   $Easter_2010_Egg_Loc_State3;
-    if (@result == 0) goto L_NotHere;
-    getinventorylist;
-    if (@inventorylist_count == 100 && countitem(E10_COLLECT_EGGS_ID) == 0)
-    goto L_TooMany;
-    if (rand(10)) set $Easter_2010_Egg_Loc_State3, $Easter_2010_Egg_Loc_State3  & ~(1 << @obj);
-    set Easter_2010_EggState3, Easter_2010_EggState3 | (1 << @obj);
-    mes "You pick up  an egg.";
-    getitem  E10_COLLECT_EGGS_ID, 1;
-    return;
-
-L_NotHere:
-    mes "You can't find an egg here.";
-    set @result, 0;
-    return;
-
-L_TooMany:
-    mes "You don't have room for this egg.";
-    set @result, 0;
-    return;
-}
-
-function	script	Easter2010Loc_Check4	{
-    set  @result,  ~Easter_2010_EggState4 & (1 << @obj) &   $Easter_2010_Egg_Loc_State4;
-    if  (@result == 0) goto L_NotHere;
-    getinventorylist;
-    if (@inventorylist_count == 100 && countitem(E10_COLLECT_EGGS_ID) == 0)
-    goto L_TooMany;
-    if  (rand(10)) set $Easter_2010_Egg_Loc_State4, $Easter_2010_Egg_Loc_State4  & ~(1 << @obj);
-    set Easter_2010_EggState4, Easter_2010_EggState4 | (1 << @obj);
-    mes "You pick up an egg.";
-    getitem  E10_COLLECT_EGGS_ID, 1;
-    return;
-
-L_NotHere:
-    mes "You can't find an egg here.";
-    set @result, 0;
-    return;
-
-L_TooMany:
-    mes "You don't have room for this egg.";
-    set @result, 0;
-    return;
-}
-
-function	script	Easter2010Loc_Check5	{
-    set  @result, ~Easter_2010_EggState5 & (1 << @obj) &    $Easter_2010_Egg_Loc_State5;
-    if  (@result == 0) goto L_NotHere;
-    getinventorylist;
-    if (@inventorylist_count == 100 && countitem(E10_COLLECT_EGGS_ID) == 0)
-    goto L_TooMany;
-    if (rand(10)) set  $Easter_2010_Egg_Loc_State5, $Easter_2010_Egg_Loc_State5 & ~(1 << @obj);
-    set Easter_2010_EggState5, Easter_2010_EggState5 | (1 << @obj);
-    mes "You pick up  an egg.";
-    getitem E10_COLLECT_EGGS_ID, 1;
-    return;
-
-L_NotHere:
-    mes "You can't find an egg here.";
-    set @result, 0;
-    return;
-
-L_TooMany:
-    mes "You don't have room for this egg.";
-    set @result, 0;
-    return;
-}
diff --git a/world/map/npc/easter/2010/eggs.txt b/world/map/npc/easter/2010/eggs.txt
deleted file mode 100644
index cf4b81f4..00000000
--- a/world/map/npc/easter/2010/eggs.txt
+++ /dev/null
@@ -1,947 +0,0 @@
-//
-
-007-1.gat,38,22,0	script	 Flowers	127,{
-	set @obj, 0;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-007-1.gat,40,41,0	script	 Grass	127,{
-	set @obj, 1;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-007-1.gat,18,71,0	script	 Stone	127,{
-	set @obj, 2;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-007-1.gat,58,33,0	script	 Tree	127,{
-	set @obj, 3;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-007-1.gat,36,58,0	script	 Flowers	127,{
-	set @obj, 4;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-007-1.gat,91,25,0	script	 Plant	127,{
-	set @obj, 5;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-007-1.gat,66,52,0	script	 Sign	127,{
-	set @obj, 6;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-007-1.gat,104,33,0	script	 Tree	127,{
-	set @obj, 7;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-007-1.gat,99,39,0	script	 Plant	127,{
-	set @obj, 8;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-007-1.gat,125,20,0	script	 Rock	127,{
-	set @obj, 9;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-007-1.gat,117,33,0	script	 Plant	127,{
-	set @obj, 10;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-007-1.gat,114,54,0	script	 Tree	127,{
-	set @obj, 11;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-008-1.gat,97,28,0	script	 Haystack	127,{
-	set @obj, 12;
-	callfunc "Easter2010Loc_Check1";
-	if (@result != 0) close;
-	if ((Easter_2010_QuestState >> E10_LOC_NEEDLE_SHIFT) & E10_LOC_NEEDLE_MASK == ($Easter_2010_Npc_State2 >> E10_NEEDLE_SHIFT) & E10_NEEDLE_MASK && rand(100) == 0) goto L_Needle;
-	close;
-
-L_Needle:
-	getitem "BentNeedle", 1;
-	set Easter_2010_QuestState, Easter_2010_QuestState & ~(E10_LOC_NEEDLE_MASK << E10_LOC_NEEDLE_SHIFT) | (rand(E10_LOC_NEEDLE_MASK) << E10_LOC_NEEDLE_SHIFT);
-	end;
-
-OnInit:
-	if (debug >= 2) end;
-	initnpctimer;
-
-OnTimer300000:
-	set $Easter_2010_Npc_State2, $Easter_2010_Npc_State2 & ~(E10_NEEDLE_MASK << E10_NEEDLE_SHIFT) | (rand(E10_NEEDLE_MASK) << E10_NEEDLE_SHIFT);
-	setnpctimer 0;
-}
-
-008-1.gat,88,48,0	script	 Target	127,{
-	set @obj, 13;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-008-1.gat,137,85,0	script	 Tree	127,{
-	set @obj, 14;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-008-1.gat,46,18,0	script	 Rocks	127,{
-	set @obj, 15;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-008-1.gat,36,28,0	script	 Rock	127,{
-	set @obj, 16;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-008-1.gat,44,26,0	script	 Flowers	127,{
-	set @obj, 17;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-008-1.gat,68,21,0	script	 Wheat	127,{
-	set @obj, 18;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-008-1.gat,103,27,0	script	 Scythe	127,{
-	set @obj, 19;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-008-1.gat,128,25,0	script	 Trees	127,{
-	set @obj, 20;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-008-1.gat,134,39,0	script	 Flowers	127,{
-	set @obj, 21;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-008-1.gat,134,61,0	script	 Tree	127,{
-	set @obj, 22;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-008-1.gat,129,77,0	script	 Flowers	127,{
-	set @obj, 23;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-008-1.gat,121,95,0	script	 Tree	127,{
-	set @obj, 24;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-008-1.gat,99,91,0	script	 Tree	127,{
-	set @obj, 25;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-008-1.gat,64,90,0	script	 Grass	127,{
-	set @obj, 26;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-008-1.gat,46,83,0	script	 Pond	127,{
-	set @obj, 27;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-008-1.gat,43,64,0	script	 Tree	127,{
-	set @obj, 28;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-009-1.gat,26,32,0	script	 Tree	127,{
-	set @obj, 29;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-009-1.gat,25,51,0	script	 Flowers	127,{
-	set @obj, 30;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-009-1.gat,44,46,0	script	 Stump	127,{
-	set @obj, 31;
-	callfunc "Easter2010Loc_Check1";
-	close;
-}
-
-009-1.gat,36,34,0	script	 Sign	127,{
-	set @obj, 0;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-1.gat,45,25,0	script	 Tree	127,{
-	set @obj, 1;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-1.gat,54,31,0	script	 Flower pot	127,{
-	set @obj, 2;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-1.gat,61,34,0	script	 Sign	127,{
-	set @obj, 3;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-1.gat,67,33,0	script	 Pots	127,{
-	set @obj, 4;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-1.gat,78,34,0	script	 Sign	127,{
-	set @obj, 5;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-1.gat,85,35,0	script	 Flower pot	127,{
-	set @obj, 6;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-1.gat,95,33,0	script	 Flowers	127,{
-	set @obj, 7;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-1.gat,90,27,0	script	 Bench	127,{
-	set @obj, 8;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-1.gat,94,52,0	script	 Tree	127,{
-	set @obj, 9;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-1.gat,82,51,0	script	 Tree	127,{
-	set @obj, 10;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-1.gat,77,45,0	script	 Barrel	127,{
-	set @obj, 11;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-1.gat,62,46,0	script	 Chimney	127,{
-	set @obj, 12;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-1.gat,54,38,0	script	 Tree	127,{
-	set @obj, 13;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,67,48,0	script	 Shelf	127,{
-	set @obj, 14;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,37,24,0	script	 Table	127,{
-	set @obj, 15;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,68,29,0	script	 Bed	127,{
-	set @obj, 16;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,94,25,0	script	 Display	127,{
-	set @obj, 17;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,123,21,0	script	 Shelf	127,{
-	set @obj, 18;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,151,25,0	script	 Candle	127,{
-	set @obj, 19;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,57,48,0	script	 Fireplace	127,{
-	set @obj, 20;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,62,56,0	script	 Table	127,{
-	set @obj, 21;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,101,44,0	script	 Bed	127,{
-	set @obj, 22;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,123,44,0	script	 Plant	127,{
-	set @obj, 23;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,112,43,0	script	 Window	127,{
-	set @obj, 24;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,146,42,0	script	 Table	127,{
-	set @obj, 25;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,153,46,0	script	 Railing	127,{
-	set @obj, 26;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,18,103,0	script	 Chair	127,{
-	set @obj, 27;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,27,97,0	script	 Shield	127,{
-	set @obj, 28;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,148,64,0	script	 Counter	127,{
-	set @obj, 29;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,177,58,0	script	 Display	127,{
-	set @obj, 30;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,184,63,0	script	 Display	127,{
-	set @obj, 31;
-	callfunc "Easter2010Loc_Check2";
-	close;
-}
-
-009-2.gat,148,80,0	script	 Container	127,{
-	set @obj, 0;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-009-2.gat,143,85,0	script	 Shelf	127,{
-	set @obj, 1;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-009-2.gat,150,83,0	script	 Shelf	127,{
-	set @obj, 2;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-009-2.gat,151,88,0	script	 Bag	127,{
-	set @obj, 3;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-009-2.gat,126,69,0	script	 Cupboard	127,{
-	set @obj, 4;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-009-2.gat,118,68,0	script	 Fireplace	127,{
-	set @obj, 5;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-009-2.gat,111,72,0	script	 Shield	127,{
-	set @obj, 6;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-009-2.gat,103,74,0	script	 Table	127,{
-	set @obj, 7;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-010-1.gat,24,66,0	script	 Rock	127,{
-	set @obj, 8;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-010-1.gat,120,84,0	script	 Rock	127,{
-	set @obj, 9;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-010-1.gat,27,95,0	script	 Barrel	127,{
-	set @obj, 10;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-010-1.gat,51,34,0	script	 Sign	127,{
-	set @obj, 11;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-010-1.gat,71,74,0	script	 Dead Tree	127,{
-	set @obj, 12;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-010-1.gat,48,82,0	script	 Flowerpot	127,{
-	set @obj, 13;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-010-1.gat,21,97,0	script	 Water	127,{
-	set @obj, 14;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-010-1.gat,130,45,0	script	 Grass	127,{
-	set @obj, 15;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-010-1.gat,45,102,0	script	 Plant	127,{
-	set @obj, 16;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-011-1.gat,38,36,0	script	 Cave	127,{
-	set @obj, 17;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-011-1.gat,87,33,0	script	 Oscar's Hat	127,{
-	set @obj, 18;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-011-1.gat,91,37,0	script	 Lattice	127,{
-	set @obj, 19;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-011-1.gat,97,37,0	script	 Drain	127,{
-	set @obj, 20;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-011-1.gat,88,66,0	script	 Bullrushes	127,{
-	set @obj, 21;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-011-1.gat,104,69,0	script	 Plant	127,{
-	set @obj, 22;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-011-1.gat,112,76,0	script	 Crevice	127,{
-	set @obj, 23;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-011-1.gat,108,89,0	script	 Grass	127,{
-	set @obj, 24;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-011-1.gat,83,85,0	script	 Stump	127,{
-	set @obj, 25;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-011-1.gat,59,92,0	script	 Sign	127,{
-	set @obj, 26;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-011-1.gat,36,90,0	script	 Tree	127,{
-	set @obj, 27;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-011-1.gat,50,103,0	script	 Tree	127,{
-	set @obj, 28;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-011-1.gat,26,89,0	script	 Stream	127,{
-	set @obj, 29;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-011-1.gat,35,75,0	script	 Tree	127,{
-	set @obj, 30;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-011-1.gat,48,79,0	script	 Flowers	127,{
-	set @obj, 31;
-	callfunc "Easter2010Loc_Check3";
-	close;
-}
-
-011-1.gat,70,69,0	script	 Tree	127,{
-	set @obj, 0;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-011-1.gat,100,41,0	script	 Field	127,{
-	set @obj, 1;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-011-1.gat,89,37,0	script	 Flower pot	127,{
-	set @obj, 2;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-011-1.gat,77,32,0	script	 Foundation	127,{
-	set @obj, 3;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-011-1.gat,65,39,0	script	 Cattails	127,{
-	set @obj, 4;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-011-1.gat,45,35,0	script	 Plant	127,{
-	set @obj, 5;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-011-2.gat,29,29,0	script	 Torch	127,{
-	set @obj, 6;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-011-2.gat,33,51,0	script	 Water	127,{
-	set @obj, 7;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-011-2.gat,39,48,0	script	 Stalagmite	127,{
-	set @obj, 8;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-012-1.gat,124,137,0	script	 Tree	127,{
-	set @obj, 9;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-012-1.gat,143,121,0	script	 Treestump	127,{
-	set @obj, 10;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-012-1.gat,136,72,0	script	 Treestump	127,{
-	set @obj, 11;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-012-1.gat,110,44,0	script	 Grass	127,{
-	set @obj, 12;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-012-1.gat,123,115,0	script	 Island	127,{
-	set @obj, 13;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-012-1.gat,96,129,0	script	 Rock	127,{
-	set @obj, 14;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-012-1.gat,109,147,0	script	 Treestump	127,{
-	set @obj, 15;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-012-1.gat,118,98,0	script	 Waterfall	127,{
-	set @obj, 16;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-012-1.gat,99,110,0	script	 Rock	127,{
-	set @obj, 17;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-012-3.gat,62,141,0	script	 Torch	127,{
-	set @obj, 18;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-013-1.gat,135,71,0	script	 Treestump	127,{
-	set @obj, 19;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-013-1.gat,124,23,0	script	 Flower	127,{
-	set @obj, 20;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-013-1.gat,128,100,0	script	 Plant	127,{
-	set @obj, 21;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-013-1.gat,41,88,0	script	 Rock	127,{
-	set @obj, 22;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-013-1.gat,89,28,0	script	 Rock	127,{
-	set @obj, 23;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-013-1.gat,131,21,0	script	 Flowers	127,{
-	set @obj, 24;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-013-1.gat,116,48,0	script	 Treestump	127,{
-	set @obj, 25;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-013-1.gat,62,70,0	script	 Tree	127,{
-	set @obj, 26;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-014-1.gat,97,92,0	script	 Tree	127,{
-	set @obj, 27;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-014-1.gat,102,72,0	script	 Rock	127,{
-	set @obj, 28;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-014-1.gat,61,85,0	script	 Stump	127,{
-	set @obj, 29;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-014-1.gat,49,66,0	script	 Stump	127,{
-	set @obj, 30;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-014-1.gat,80,91,0	script	 Tree	127,{
-	set @obj, 31;
-	callfunc "Easter2010Loc_Check4";
-	close;
-}
-
-018-1.gat,71,98,0	script	 Tree	127,{
-	set @obj, 0;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-1.gat,63,87,0	script	 Cattails	127,{
-	set @obj, 1;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-1.gat,62,74,0	script	 Foundation	127,{
-	set @obj, 2;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-1.gat,65,78,0	script	 Firepit	127,{
-	set @obj, 3;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-1.gat,94,88,0	script	 Tree	127,{
-	set @obj, 4;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-1.gat,82,67,0	script	 Plant	127,{
-	set @obj, 5;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-1.gat,81,59,0	script	 Barrel	127,{
-	set @obj, 6;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-1.gat,102,73,0	script	 Tree	127,{
-	set @obj, 7;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-1.gat,135,63,0	script	 Tree	127,{
-	set @obj, 8;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-1.gat,131,93,0	script	 Tree	127,{
-	set @obj, 9;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-2.gat,57,26,0	script	 Flower pot	127,{
-	set @obj, 10;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-2.gat,51,20,0	script	 Shield	127,{
-	set @obj, 11;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-2.gat,36,21,0	script	 Bag	127,{
-	set @obj, 12;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-2.gat,33,32,0	script	 Container	127,{
-	set @obj, 13;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-2.gat,25,45,0	script	 Anvil	127,{
-	set @obj, 14;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-2.gat,23,28,0	script	 Table	127,{
-	set @obj, 15;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-2.gat,82,19,0	script	 Bookcase	127,{
-	set @obj, 16;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-2.gat,91,31,0	script	 Table	127,{
-	set @obj, 17;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-2.gat,79,46,0	script	 Bed	127,{
-	set @obj, 18;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-2.gat,116,22,0	script	 Chair	127,{
-	set @obj, 19;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-2.gat,123,19,0	script	 Mug	127,{
-	set @obj, 20;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-2.gat,118,24,0	script	 Woodpile	127,{
-	set @obj, 21;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-2.gat,119,40,0	script	 Teapot	127,{
-	set @obj, 22;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-2.gat,125,49,0	script	 Corner	127,{
-	set @obj, 23;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-3.gat,34,22,0	script	 Skull	127,{
-	set @obj, 24;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-3.gat,24,32,0	script	 Stalagmite	127,{
-	set @obj, 25;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
-018-3.gat,65,30,0	script	 Torch	127,{
-	set @obj, 26;
-	callfunc "Easter2010Loc_Check5";
-	close;
-}
-
diff --git a/world/map/npc/easter/2010/helper.txt b/world/map/npc/easter/2010/helper.txt
deleted file mode 100644
index aaa9b42e..00000000
--- a/world/map/npc/easter/2010/helper.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-028-1.gat,136,50,0	script	Control#Helper	127,{
-close;
-
-OnBarrierEnable:
-    set $Easter_2010_Npc_State2, ($Easter_2010_Npc_State2 & ~(E10_BARRIER_MASK << E10_BARRIER_SHIFT)) | (E10_BARRIER_ACTIVE << E10_BARRIER_SHIFT);
-    end;
-
-OnBarrierDisable:
-    set $Easter_2010_Npc_State2, ($Easter_2010_Npc_State2 & ~(E10_BARRIER_MASK << E10_BARRIER_SHIFT)) | (E10_BARRIER_OPEN << E10_BARRIER_SHIFT);
-    end;
-
-OnInit:
-    goto OnBarrierEnable;
-
-}
diff --git a/world/map/npc/easter/2011/bunny.txt b/world/map/npc/easter/2011/bunny.txt
deleted file mode 100644
index 515ca79b..00000000
--- a/world/map/npc/easter/2011/bunny.txt
+++ /dev/null
@@ -1,215 +0,0 @@
-//Easter Quest 2011
-//conceived and scripted by Tiana
-//Reviewed by alastrim, Jenalya, Kandiman, enchilado
-//To enable: sed 's_^// __' -i npc/easter/2011/easter.txt
-
-// 008-1.gat,45,23, 0	script	Easter Bunny	173,{
-//     set @month, 4;
-//     set @start_day, 15;
-//     set @end_day, 30;
-
-//     if (gettime(6) != @month) goto no_event;
-//     if (gettime(5) < @start_day) goto no_event;
-//     if (gettime(5) > @end_day) goto no_event;
-//     if (gettimetick(2)-TUT_var < 2*7*86400) goto L_TooSoon;
-
-//     if (QUEST_Easter11 == 1 || QUEST_Easter11 == 2) goto L_GetBasket;
-//     if (QUEST_Easter11 == 3) goto L_BasketCheck;
-//     if (QUEST_Easter11 == 4 || QUEST_Easter11 == 5) goto L_GetGrass;
-//     if (QUEST_Easter11 == 6) goto L_GrassCheck;
-//     if (QUEST_Easter11 == 7 || QUEST_Easter11 == 8) goto L_GetJelly;
-//     if (QUEST_Easter11 == 9) goto L_JellyCheck;
-//     if (QUEST_Easter11 == 10 || QUEST_Easter11 == 11) goto L_GetChoco;
-//     if (QUEST_Easter11 == 12) goto L_ChocoCheck;
-//     if (QUEST_Easter11 == 13) goto L_GetPrizes;
-//     if (QUEST_Easter11 == 14) goto L_Done;
-//     if (BaseLevel < 40) goto L_TooYoung;
-
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"Hi there!  Would you like to help me with this year's Easter Quest?\"";
-//     next;
-
-//     menu
-//         "What kind of help do you need?", -,
-//         "No way, these holiday quests suck.", L_End;
-
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"I need you to help me by getting an easter basket ready for me.\"";
-//     next;
-
-//     menu
-//         "I should be able to help with that, what do I need to do?", -,
-//         "That doesn't sound very exciting, no thanks.", L_End;
-
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"Thank you! Here is what you need to do:\"";
-//     mes "\"I need you to get me a basket, the grass to line it, and some stuff to put in the basket. Some people should be able to help you get those items.\"";
-//     next;
-//     mes "\"I cannot remember who though. Maybe you should start with the Basket. You should look for someone with good handicraft abilities, someone who knows how to work with reeds... Do you have any idea who could do this? \"";
-//     next;
-
-//     menu
-//         "Ok, I'll ask around and see what I can find.", -,
-//         "You can't give me more help than that?  Then go do it yourself.", L_End;
-
-//     set QUEST_Easter11, 1;
-//     close;
-
-// L_GetBasket:
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"I see that you haven't found anyone who can make the basket yet... hmm... a reed basket... Who could make such an item?\"";
-//     set @tip, rand(10);
-//     if (@tip != 9) close;
-//     next;
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"Hey... I just remembered. I heard there is an indian fellow living in the mountains who comes from a tribe that is famous for its beautiful craftwork. Maybe he can make the basket...\"";
-//     close;
-
-// L_BasketCheck:
-//     if(countitem("EasterBasket") < 1) goto L_BasketNoitem;
-//     delitem "EasterBasket", 1;
-//     set QUEST_Easter11, 4;
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"Very good. This basket is perfect. Now I need some grass to line it. But please, do not pull it from the ground, because it makes the basket really ugly and dirty. I am sure there must be someone who can help you grow a nice, clean patch of grass.\"";
-//     close;
-
-// L_BasketNoitem:
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"I heard you talked to that indian in the mountains. That was very smart! But you do not have the basket... That is too bad.\"";
-//     close;
-
-// L_GetGrass:
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"I see you didn't find the [Grass Liner]... If only I could help you find someone who can do this...\"";
-//     set @tip, rand(10);
-//     if (@tip != 9) close;
-//     next;
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"Wait... ohh... Now I remember. Last year there was a woman who helped me with a perfect and clean [Grass Liner] for my easter basket. She used to live near the magic school in Tulimshar. Maybe she is still there.\"";
-//     close;
-
-// L_GrassCheck:
-//     if(countitem("GrassLiner") < 1) goto L_GrassNoitem;
-//     delitem "GrassLiner", 1;
-//     set QUEST_Easter11, 7;
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"Perfect. This basket is going to be beautiful. Now I need some stuff to put in the basket. I think we should start with some [Jelly Beans]. But I have no idea where you can find any. I looked in all of Hurnscald's shops and no one sells them! Maybe you will need to find someone who can cook them.\"";
-//     close;
-
-// L_GrassNoitem:
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"You talked to Eomie, the woman who maintains that little spot of grass in the desert. You are really smart! But what happened? I was expecting that you would come back with the [Grass Liner]...\"";
-//     close;
-
-// L_GetJelly:
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"Hi... Sorry to cause you so much trouble. This candy is so hard to find... One time I tried to make some myself and it was really bad... I'm sure there must be a secret ingredient I didn't know.\"";
-//     set @tip, rand(10);
-//     if (@tip != 9) close;
-//     next;
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"Hey, maybe you can ask a skilled chef to make some [Jelly Beans] for you.\"";
-//     close;
-
-// L_JellyCheck:
-//     if(countitem("JellyBeans") < 1) goto L_JellyNoitem;
-//     delitem "JellyBeans", 1;
-//     set QUEST_Easter11, 10;
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"Ohh. You got a lot of [Jelly Beans]! This is way better than I expected. Now I there is only one more thing that we need... Chocolate! But not the usual [Chocolate Bar].  I need the chocolate shaped in the form of a mouboo. Sadly, I also have no idea how to get it. I am sure that a brilliant person like you can find a way to get it... \"";
-//     close;
-
-// L_JellyNoitem:
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"I see you talked with the Chef at Dimond's Cove but you came back with no [Jelly Beans]... What happened?\"";
-//     close;
-
-// L_GetChoco:
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"Hello. I was thinking... Maybe someone could melt down some [Chocolate Bar]s and pour it into a mouboo shaped mold...\"";
-//     set @tip, rand(10);
-//     if (@tip != 9) close;
-//     next;
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"Hmm... A bakery! I am sure there must be someone in a bakery that can do this.\"";
-//     close;
-
-// L_ChocoCheck:
-//     if(countitem("ChocolateMouboo") < 1) goto L_ChocoNoitem;
-//     delitem "ChocolateMouboo", 1;
-//     set QUEST_Easter11, 13;
-
-// L_GetPrizes:
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"Great, now the basket is perfect!\"";
-//     mes "\"I really appreciate your help.  With everyone helping I was able to have enough time to do some crafts.\"";
-//     mes "\"Here, accept this simple gift as a thank you!\"";
-//     getinventorylist;
-//     if (@inventorylist_count == 100) goto L_EasterTooMany;
-//     setarray @reward$, "BunnyEars", "TopHat", "MushHat", "ShroomHat", "FunkyHat";
-//     getitem @reward$[rand(getarraysize(@reward$))], 1;
-//     set QUEST_Easter11, 14;
-//     close;
-
-// L_ChocoNoitem:
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"Some people told me you were in a bakery in Tulimshar... I was hoping you would come back with the [Chocolate Mouboo].\"";
-//     close;
-
-// L_TooYoung:
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"Hello there young one!\"";
-//     mes "\"Gain some more strength and I have a quest for you.\"";
-//     close;
-
-// L_TooSoon:
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"Hello there!\"";
-//     mes "\"I need some help with Easter this year,\"";
-//     mes "\"however you are not experienced enough in this world to properly assist yet.\"";
-//     mes "\"Thank you for your interest though!\"";
-//     close;
-
-// L_EasterTooMany:
-//     mes "[Riskim]";
-//     mes "";
-//     mes "\"You don't have enough room for my gift. Come back later.\"";
-//     close;
-
-// L_Done:
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"Thank you for getting that basket together for me!\"";
-//     close;
-
-// no_event:
-//     mes "[Easter Bunny]";
-//     mes "";
-//     mes "\"Easter is the greatest holiday ever!!!\"";
-//     set QUEST_Easter11, 0;
-//     close;
-
-// L_End:
-//     close;
-// }
diff --git a/world/map/npc/easter/2012/_import.txt b/world/map/npc/easter/2012/_import.txt
deleted file mode 100644
index ce4d6ac4..00000000
--- a/world/map/npc/easter/2012/_import.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-npc: npc/easter/2012/doors.txt
-npc: npc/easter/2012/easter2012config.txt
-npc: npc/easter/2012/easterbunny.txt
-npc: npc/easter/2012/unclebunny.txt
diff --git a/world/map/npc/easter/2012/doors.txt b/world/map/npc/easter/2012/doors.txt
deleted file mode 100644
index 4fe14a33..00000000
--- a/world/map/npc/easter/2012/doors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-004-2.gat,62,28,0|script|#kidnapperdoor|32767,0,0{
-    if (QUEST_Easter12 < 4)
-        goto L_Locked;
-    if (QUEST_Easter12 == 4)
-        message strcharinfo(0), "As you look at the door, you notice the lock is broken. Walking inside the room, you notice some white fur around the room. The Easter Bunny was probably here and found a way to escape. You should talk to Uncle Bunny.";
-    if (QUEST_Easter12 == 4)
-        set QUEST_Easter12, 5;
-    warp "004-2.gat", 21, 61;
-    end;
-
-L_Locked:
-    message strcharinfo(0), "The door to the basement is locked.";
-    end;
-}
-
-021-2.gat,42,53,0|script|#easterbunnydoor|32767,0,0{
-    if (QUEST_Easter12 < 5)
-        end;
-    warp "021-2.gat", 70, 57;
-    end;
-}
diff --git a/world/map/npc/easter/2012/easter2012config.txt b/world/map/npc/easter/2012/easter2012config.txt
deleted file mode 100644
index 9d26e765..00000000
--- a/world/map/npc/easter/2012/easter2012config.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-// Easter 2012
-// Storyline conceived by mainly by prsm with suggestions from TheKandiman
-// Scripting by mostly by alastrim
-// Bug fixing and testing by Jenalya
-
-// Variable QUEST_Easter12 values:
-// 1 - Player agree to help uncle bunny (to get pearls, petals and orange cupcakes). (unclebunny.txt)
-// 2 - Player gave the items to uncle bunny. Now he needs to look for Frozenbeard. (unclebunny.txt)
-// 3 - Player found Frozenbeard and got information from him after giving him a black pearl. Now he needs to look for George. (frozenbeard.txt)
-// 4 - Player found George and got information from him about a possible location for the Easter bunny. (george.txt)
-// 5 - Player found the place where the Easter bunny was locked up. (#kidnapperdoor/doors.txt)
-// 6 - Player talked to Easter bunny and received the pan hat as a reward. The bunny told the chef wants to talk to you. (easterbunny.txt)
-// 7 - Player agreed to lend his pan hat to the chef.
-// 8 - Player received a jar of pickled beets from the chef, but the hat is ruined.
-// 9 - The chef offers the player a new hat after he tries to leave the room. (#chefproposition/doors.txt)
-// 10 - Player picks one of the options offered by the chef. (keep the pickled beets or change it for a chef hat)
-// 10 - OR Player got the pickled beets and the pan hat wasn't ruined during the process.
-
--|script|#easter2012config|-1,{
-OnInit:
-    set $@easter2012_start_day, 23;
-    set $@easter2012_reward_start_day, 8;
-    set $@easter2012_reward_end_day, 22;
-    set $@easter2012_year, 2012;
-    set $@easter2012_pearl_amount, 3;
-    set $@easter2012_orangecupcake_amount, 20;
-    set $@easter2012_pinkpetal_amount, 5;
-}
diff --git a/world/map/npc/easter/2012/easterbunny.txt b/world/map/npc/easter/2012/easterbunny.txt
deleted file mode 100644
index 85767656..00000000
--- a/world/map/npc/easter/2012/easterbunny.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-// Easter bunny
-
-021-2.gat,69,55,0|script|Easter Bunny|173,{
-
-    if (QUEST_Easter12 >= 6) goto L_Easterbunny_Thanks;
-    if (QUEST_Easter12 < 5) goto L_Easterbunny_Notyet;
-
-    mes "[Easter Bunny]";
-    mes "\"Hi " + strcharinfo(0) + "! I was waiting for you. My uncle told me all about the pirates and how you were working really hard to save me. So I decided to give you a gift. You know, such generous and brave actions must be rewarded somehow.\"";
-    next;
-    mes "\"Here is what I have for you. I used it to break the lock of door in that basement. It seems to be a very resistant pan, but it can also be used as a hat. Enjoy!\"";
-    getitem "PanHat", 1;
-    set QUEST_Easter12, 6;
-    next;
-    mes "\"Oh, I forgot to mention. The Chef in Dimond's cove was really interested in this pan when he saw it. I told him it was yours, so you are the one who can decide about this.\"";
-    next;
-    mes "\"If I were you I would see what he wants with this pan, maybe you can even get something good out of it.\"";
-    close;
-
-L_Easterbunny_Notyet:
-    mes "[Easter Bunny]";
-    mes "\"Hello!\"";
-    close;
-
-L_Easterbunny_Thanks:
-    mes "[Easter Bunny]";
-    mes "\"Hello " + strcharinfo(0) + "! Thanks again for all your help.";
-    mes "I don't remember... did I tell you about the Chef from Dimond's cove? He wanted to ask you something about the pan.\"";
-    close;
-}
diff --git a/world/map/npc/easter/2012/unclebunny.txt b/world/map/npc/easter/2012/unclebunny.txt
deleted file mode 100644
index 0792ac2a..00000000
--- a/world/map/npc/easter/2012/unclebunny.txt
+++ /dev/null
@@ -1,135 +0,0 @@
-// Uncle Bunny
-008-1.gat,45,23,0|script|Uncle Bunny|336,{
-
-    if ((BaseLevel < 30) || (gettimetick(2)-TUT_var < 3*7*86400)) // player must be created at least three weeks ago
-        goto L_TooYoung;
-
-    if (!(gettime(6) == 3 && gettime(5) >= $@easter2012_start_day) && !(gettime(6) == 4 && gettime(5) < $@easter2012_reward_start_day))
-        goto L_Easter2012Over;
-
-    if (QUEST_Easter12 == 1) goto L_Return_Death_Threat;
-    if (QUEST_Easter12 > 1 && QUEST_Easter12 < 5) goto L_Return_Frozenbeard;
-    if (QUEST_Easter12 == 5) goto L_Return_Easter_Bunny;
-    if (QUEST_Easter12 > 5) goto L_Easter2012Over;
-
-    mes "You see a big, funny-looking bunny wearing a bowler hat. He gazes at the horizon with a very sad face.";
-    menu
-        "Hey you, can I help you with anything?", -,
-        "Leave the bunny alone with his problems.", L_Close;
-
-    mes "[Uncle Bunny]";
-    mes "\"Oh, hi! Sorry, I didn't notice you were here. I am so worried about my nephew and his current situation that I can't barely keep a normal conversation.\"";
-    menu
-        "Sorry, but I don't want to be involved in your family troubles right now.", L_Close,
-        "Who is your nephew? What happened to him?", -;
-
-    if (QUEST_Easter11 != 14)
-        goto L_Dont_Know_Easter11;
-
-    mes "[Uncle Bunny]";
-    mes "\"I believe you know him already. He is the Easter Bunny, the one you helped last year with a very nice Easter basket. But this year he can't even work on his things...\"";
-    goto L_Ask_For_Help;
-
-L_Dont_Know_Easter11:
-    mes "[Uncle Bunny]";
-    mes "\"I don't think you know him personally, but he is very famous. He is the Easter Bunny. He is widely known for his beautiful baskets full of candies and chocolates but also about his memory problems.\"";
-
-L_Ask_For_Help:
-    next;
-    mes "\"The problem is that some pirates kidnapped him and now they are asking for a lot of expensive things to set him free! They just sent me a terrible message! They are asking for items just to keep him alive!\"";
-    next;
-    mes "\"These criminals are probably inspired by that evil man who kidnapped Santa a couple years ago... They must be thinking they are going to get away with the ransom, just like the other guy. But we have to do something about it! Would you help me with this problem?\"";
-    next;
-    menu
-        "Of course I will. What do you need me to do?", -,
-        "Ehh... I am really busy right now, maybe later.", L_Close;
-
-    set QUEST_Easter12, 1;
-    mes "[Uncle Bunny]";
-    mes "\"Great! We need to be fast. They said they need " + $@easter2012_pearl_amount + " pearls, " + $@easter2012_orangecupcake_amount + " orange cupcakes and " + $@easter2012_pinkpetal_amount + " pink petals to keep him alive. Please, bring it to me as fast as you can.\"";
-    goto L_Close;
-
-L_Return_Death_Threat:
-    mes "[Uncle Bunny]";
-    mes "\"You are back!\"";
-    next;
-    if (countitem("Pearl") >= $@easter2012_pearl_amount && countitem("OrangeCupcake") >= $@easter2012_orangecupcake_amount && countitem("PinkPetal") >= $@easter2012_pinkpetal_amount)
-        goto L_Return_Death_Threat_With;
-
-    mes "\"Oh, but you don't have the items... Remember, we need " + $@easter2012_pearl_amount + " pearls, " + $@easter2012_orangecupcake_amount + " orange cupcakes and " + $@easter2012_pinkpetal_amount + " pink petals to keep him alive.";
-    mes "Please hurry, the Easter Bunny's life depends on you!\"";
-    goto L_Close;
-
-L_Return_Death_Threat_With:
-    mes "\"And you have the items! Thank you! Now we have time to think about something.\"";
-    next;
-    mes "\"While you were collecting the items, I heard there is a pirate called Frozenbeard who is not one of the kidnappers. Maybe he knows something about them or where they are hiding my nephew.\"";
-    next;
-    if (countitem("Pearl") < $@easter2012_pearl_amount || countitem("OrangeCupcake") < $@easter2012_orangecupcake_amount || countitem("PinkPetal") < $@easter2012_pinkpetal_amount)
-        goto L_Noitems;
-    delitem "Pearl", $@easter2012_pearl_amount;
-    delitem "OrangeCupcake", $@easter2012_orangecupcake_amount;
-    delitem "PinkPetal", $@easter2012_pinkpetal_amount;
-    set QUEST_Easter12, 2;
-    getitem "BlackPearl", 1;
-    mes "\"Please, any information you get from him will be extremely valuable! And here, take this black pearl. I heard he is a greedy man, so you can offer this item in case he shows any sign of fear or decides to put a price to his knowledge.\"";
-    goto L_Close;
-
-L_Return_Frozenbeard:
-    mes "[Uncle Bunny]";
-    mes "\"So, what did you find out?\"";
-    next;
-    if (QUEST_Easter12 == 2)
-        menu
-            "Nothing yet, I still need to find this man.", L_Return_Frozenbeard_Close;
-
-    if (QUEST_Easter12 == 3)
-        menu
-            "I found Frozenbeard, but he only referred me to another person.", L_Return_Frozenbeard_George;
-
-    if (QUEST_Easter12 == 4)
-        menu
-            "I know where he is. I am going to save him!", L_Return_Frozenbeard_Save;
-
-L_Return_Frozenbeard_Close:
-    mes "[Uncle Bunny]";
-    mes "\"Please, don't waste too much time or this is going to be a tragedy!\"";
-    goto L_Close;
-
-L_Return_Frozenbeard_George:
-    mes "[Uncle Bunny]";
-    mes "\"Then go after this person!\"";
-    goto L_Close;
-
-L_Return_Frozenbeard_Save:
-    mes "[Uncle Bunny]";
-    mes "\"Oh, Really? Are you sure about this information? If I were younger I would go with you and take my nephew from the hands of the pirates myself, but I am old and weak... All I can do is wish you good luck!\"";
-    goto L_Close;
-
-L_Return_Easter_Bunny:
-    mes "[Uncle Bunny]";
-    mes "\"" + strcharinfo(0) + "! You won't believe it! My nephew escaped! He just showed up as if nothing had happened... He told me he woke up in a strange house and realized he didn't know how he got there. Can you believe that?\"";
-    next;
-    mes "\"My nephew forgot he had been kidnapped! He thought it was just one of his blackouts... So, since the door was locked, he just broke the lock and escaped! I guess the pirates were not counting on such a bold move from his part, hahah!\"";
-    next;
-    mes "\"But don't worry, I told him all about the pirates and your efforts to save him! Now he wants to talk to you, he says you deserve a special gift. He went to the Tulimshar workshop where he gets some help with the Easter issues and is waiting for you there.\"";
-    goto L_Close;
-
-L_Easter2012Over:
-    mes "[Uncle Bunny]";
-    mes "\"Ah, I am so glad my nephew was found! Now the nightmare is over! I hope his memory gets better one day.\"";
-    goto L_Close;
-
-L_Noitems:
-    mes "[Uncle Bunny]";
-    mes "\"Wait, I could swear you had the items, but they disappeared. Please, come back with the items!\"";
-    goto L_Close;
-
-L_TooYoung:
-    mes "[Uncle Bunny]";
-    mes "\"Hello, young one. This world is harsh, so be careful out there.\"";
-    goto L_Close;
-
-L_Close:
-    close;
-}