Remove Easter 2011

7 files changed, 35 insertions, 34 deletions

diff --git a/db/mob_db.txt b/db/mob_db.txt
index b81362c2..baa0eaad 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -26,7 +26,7 @@
 1025,	LogHead,		LogHead,		30,	500,	0,	0,	30,	1,	7,	20,	50,	5,	1,	1,	1,	0,	20,	25,	1,	1,	1,	3,	22,	129,	800,	1872,	672,	480,	569,	2000,		740,	2500,		743,	3000,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	1,		50
 1026,	MountainSnake,		MountainSnake,		130,	900,	0,	0,	100,	1,	80,	125,	4,	6,	20,	40,	10,	10,	35,	45,	1,	1,	1,	0,	20,	133,	1000,	1500,	672,	480,	532,	20,		641,	150,		715,	400,		715,	400,		711,	500,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	1,		30
 1027,	EasterFluffy,		EasterFluffy,		30,	500,	0,	0,	3,	1,	10,	12,	0,	5,	1,	1,	1,	0,	20,	25,	1,	1,	1,	3,	20,	129,	800,	1872,	672,	480,	1208,	2000,		1209,	2000,		1210,	2000,		1211,	1000,		1212,	1000,		1213,	200,		0,	0,		0,	0,		0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	1,		40
-1028,	Mouboo,			Mouboo,			85,	1200,	0,	0,	40,	2,	30,	75,	65,	5,	15,	5,	15,	0,	40,	10,	2,	2,	1,	3,	20,	129,	600,	1872,	672,	480,	660,	200,		660,	100,		541,	750,		660,	10,		806,	1000,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	1,		30
+1028,	Mouboo,			Mouboo,			85,	1200,	0,	0,	40,	2,	30,	75,	65,	5,	15,	5,	15,	0,	40,	10,	2,	2,	1,	3,	20,	129,	600,	1872,	672,	480,	660,	200,		660,	100,		541,	750,		660,	10,		806,	500,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	1,		30
 1029,	MauvePlant,		MauvePlant,		1,	1,	0,	0,	1,	1,	0,	0,	1,	0,	0,	0,	0,	0,	0,	0,	1,	1,	1,	3,	22,	0,	800,	800,	672,	480,	680,	3000,		680,	3000,		680,	3000,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	1,		60
 1030,	CobaltPlant,		CobaltPlant,		1,	1,	0,	0,	1,	1,	0,	0,	1,	0,	0,	0,	0,	0,	0,	0,	1,	1,	1,	3,	22,	0,	800,	800,	672,	480,	681,	3000,		681,	3000,		681,	3000,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,		0
 1031,	GambogePlant,		GambogePlant,		1,	1,	0,	0,	1,	1,	0,	0,	1,	0,	0,	0,	0,	0,	0,	0,	1,	1,	1,	3,	22,	0,	800,	800,	672,	480,	682,	3000,		682,	3000,		682,	3000,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,		0
@@ -36,7 +36,7 @@
 1035,	Silkworm,		Silkworm,		20,	1,	0,	0,	1,	1,	0,	0,	2,	10,	20,	11,	10,	10,	40,	10,	1,	1,	1,	0,	20,	129,	1300,	1100,	672,	480,	718,	5000,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	2,		40
 1036,	Zombie,			Zombie,			110,	12000,	0,	0,	800,	2,	275,	355,	20,	15,	30,	15,	30,	3,	60,	40,	1,	1,	1,	0,	29,	133,	480,	1872,	672,	900,	631,	1000,		777,	700,		778,	120,		779,	200,		780,	150,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	2,		30
 1037,	CloverPatch,		CloverPatch,		1,	1,	0,	0,	1,	1,	0,	0,	0,	5,	0,	0,	0,	0,	0,	0,	1,	1,	1,	3,	22,	0,	800,	800,	672,	480,	742,	5,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,		0
-1038,	Squirrel,		Squirrel,		15,	160,	1,	0,	1,	1,	15,	25,	1,	6,	1,	3,	1,	0,	15,	40,	1,	1,	1,	3,	20,	129,	800,	800,	672,	480,	743,	7000,		680,	1000,		681,	1000,		682,	1000,		683,	1000,		807,	800,		0,	0,		0,	0,		0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	1,		15
+1038,	Squirrel,		Squirrel,		15,	160,	1,	0,	1,	1,	15,	25,	1,	6,	1,	3,	1,	0,	15,	40,	1,	1,	1,	3,	20,	129,	800,	800,	672,	480,	743,	7000,		680,	1000,		681,	1000,		682,	1000,		683,	1000,		807,	400,		0,	0,		0,	0,		0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	1,		15
 //1039,	FireLizard,	,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,
 1040,	Wisp,			Wisp,			70,	9300,	0,	0,	140,	2,	215,	350,	0,	20,	45,	12,	13,	15,	0,	45,	1,	1,	1,	0,	27,	137,	380,	2000,	672,	1500,	772,	500,		703,	150,		703,	120,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	2,		20
 //1041,	Snail,		,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,	,
diff --git a/npc/006-1_Desert_mountains/pachua.txt b/npc/006-1_Desert_mountains/pachua.txt
index 234c6a36..a827205f 100644
--- a/npc/006-1_Desert_mountains/pachua.txt
+++ b/npc/006-1_Desert_mountains/pachua.txt
@@ -3,16 +3,18 @@
 	set @LEATHER_PATCH_PRICE, 300;
 	set @wants_leather_patch, QUEST_Forestbow_state & NIBBLE_4_MASK;
 
-	set @month, 4;
-	set @start_day, 15;
-	set @end_day, 30;
+// lines belong to easter 2011:
+//	set @month, 4;
+//	set @start_day, 15;
+//	set @end_day, 30;
 
 	if (QUEST_MIRIAM_cheat != 0) goto L_warp_cheat;
 	if (QUEST_MIRIAM_start != 0) goto L_smoke;
 
-	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 1) goto L_Basket;
-	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 2) goto L_MakeBasket;
-	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 3) goto L_SeeBunny;
+// lines belong to easter 2011:
+//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 1) goto L_Basket;
+//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 2) goto L_MakeBasket;
+//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 3) goto L_SeeBunny;
 
 L_Begin:
 	mes "[Chief Pachua]";
diff --git a/npc/008-1_Hurnscald_outskirts/_import.txt b/npc/008-1_Hurnscald_outskirts/_import.txt
index dc6dcb65..6520f76d 100644
--- a/npc/008-1_Hurnscald_outskirts/_import.txt
+++ b/npc/008-1_Hurnscald_outskirts/_import.txt
@@ -7,4 +7,3 @@ npc: npc/008-1_Hurnscald_outskirts/diryn.txt
 npc: npc/008-1_Hurnscald_outskirts/dock.txt
 npc: npc/008-1_Hurnscald_outskirts/george.txt
 npc: npc/008-1_Hurnscald_outskirts/hinnak.txt
-npc: npc/008-1_Hurnscald_outskirts/bunny.txt
diff --git a/npc/010-2_Dimonds_Cove/chef.txt b/npc/010-2_Dimonds_Cove/chef.txt
index 120e5a25..3d759005 100644
--- a/npc/010-2_Dimonds_Cove/chef.txt
+++ b/npc/010-2_Dimonds_Cove/chef.txt
@@ -1,12 +1,13 @@
 010-2.gat,33,25,0	script	Chef	148,{
 
-	set @month, 4;
-	set @start_day, 15;
-	set @end_day, 30;
-
-	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 7) goto L_JellyBean;
-	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 8) goto L_MakeJellyBean;
-	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 9) goto L_SeeBunny;
+// lines belong to easter 2011:
+//	set @month, 4;
+//	set @start_day, 15;
+//	set @end_day, 30;
+
+//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 7) goto L_JellyBean;
+//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 8) goto L_MakeJellyBean;
+//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 9) goto L_SeeBunny;
 
 L_Begin:
 	mes "[Chef]";
diff --git a/npc/021-2_Tulimshar/bakery.txt b/npc/021-2_Tulimshar/bakery.txt
index b72a24b9..11782e03 100644
--- a/npc/021-2_Tulimshar/bakery.txt
+++ b/npc/021-2_Tulimshar/bakery.txt
@@ -3,13 +3,14 @@
 // The chef
 021-2.gat,95,21,0	script	Riskim	148,{
 
-	set @month, 4;
-	set @start_day, 15;
-	set @end_day, 30;
-
-	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 10) goto L_ChocMouboo;
-	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 11) goto L_MakeChocMouboo;
-	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 12) goto L_SeeBunny;
+// lines belong to easter 2011:
+//	set @month, 4;
+//	set @start_day, 15;
+//	set @end_day, 30;
+
+//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 10) goto L_ChocMouboo;
+//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 11) goto L_MakeChocMouboo;
+//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 12) goto L_SeeBunny;
 
 L_Begin:
 	mes "[Riskim]";
diff --git a/npc/024-1_Tulimshar_Canyon/eomie.txt b/npc/024-1_Tulimshar_Canyon/eomie.txt
index fb91b07b..f2b716ac 100644
--- a/npc/024-1_Tulimshar_Canyon/eomie.txt
+++ b/npc/024-1_Tulimshar_Canyon/eomie.txt
@@ -2,13 +2,14 @@
 
 024-1.gat,72,94,0	script	Eomie	164,{
 
-	set @month, 4;
-	set @start_day, 15;
-	set @end_day, 30;
+// lines belong to easter 2011:
+//	set @month, 4;
+//	set @start_day, 15;
+//	set @end_day, 30;
 
-	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 4) goto L_Grass;
-	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 5) goto L_MakeGrass;
-	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 6) goto L_SeeBunny;
+//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 4) goto L_Grass;
+//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 5) goto L_MakeGrass;
+//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 6) goto L_SeeBunny;
 
 L_Greeting:
 	mes "[Eomie]";
diff --git a/npc/008-1_Hurnscald_outskirts/bunny.txt b/npc/easter/2011/bunny.txt
index 00c3c9e3..e9d920ac 100644
--- a/npc/008-1_Hurnscald_outskirts/bunny.txt
+++ b/npc/easter/2011/bunny.txt
@@ -1,11 +1,8 @@
 //Easter Quest 2011
 //conceived and scripted by Tiana
-//Reviewed by alastrim, Jenalya, Kandiman
+//Reviewed by alastrim, Jenalya, Kandiman, enchilado
 
-
-
-
-008-1.gat,45,23, 0	script	Easter Bunny	173,{
+// 008-1.gat,45,23, 0	script	Easter Bunny	173,{
 	set @month, 4;
 	set @start_day, 15;
 	set @end_day, 30;