summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/006-1_Desert_mountains/pachua.txt14
-rw-r--r--npc/008-1_Hurnscald_outskirts/_import.txt1
-rw-r--r--npc/010-2_Dimonds_Cove/chef.txt15
-rw-r--r--npc/021-2_Tulimshar/bakery.txt15
-rw-r--r--npc/024-1_Tulimshar_Canyon/eomie.txt13
-rw-r--r--npc/easter/2011/bunny.txt (renamed from npc/008-1_Hurnscald_outskirts/bunny.txt)7
6 files changed, 33 insertions, 32 deletions
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;