diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-04-16 08:19:50 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-04-29 18:04:53 +0200 |
| commit | ed63a1353c982694e93721575f578bc70b2b75fe (patch) | |
| tree | 7b0bf97b204196802fe93ba17f9f58b9933c4591 /npc | |
| parent | 0e3ae27faa6fd223efe6fdf05f34dba0ed38d3fc (diff) | |
| download | serverdata-ed63a1353c982694e93721575f578bc70b2b75fe.tar.gz serverdata-ed63a1353c982694e93721575f578bc70b2b75fe.tar.bz2 serverdata-ed63a1353c982694e93721575f578bc70b2b75fe.tar.xz serverdata-ed63a1353c982694e93721575f578bc70b2b75fe.zip | |
fix for a conflict of the speed skill quest with the easter quest
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/006-1_Desert_mountains/pachua.txt | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/npc/006-1_Desert_mountains/pachua.txt b/npc/006-1_Desert_mountains/pachua.txt index fbcd161b..234c6a36 100644 --- a/npc/006-1_Desert_mountains/pachua.txt +++ b/npc/006-1_Desert_mountains/pachua.txt @@ -7,14 +7,13 @@ 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; -L_Miriam_Check: - if (QUEST_MIRIAM_cheat != 0) goto L_warp_cheat; - if (QUEST_MIRIAM_start != 0) goto L_smoke; - L_Begin: mes "[Chief Pachua]"; mes ""; @@ -252,7 +251,7 @@ L_Basket: menu "I would be really grateful if you could do that!", -, "Nah, I decided not to do that stupid quest.", L_End, - "I would prefer to talk to you about other stuff.", L_Miriam_Check; //should go to pachuas's regular chat + "I would prefer to talk to you about other stuff.", L_Begin; //should go to pachuas's regular chat set QUEST_Easter11, 2; L_MakeBasket: @@ -265,7 +264,7 @@ L_MakeBasket: "I have the Reeds!", -, "Ok, I will be back soon", L_End, "I changed my mind, forget about it", L_End, - "Can I talk to you about another stuff?", L_Miriam_Check; //should go to pachuas's regular chat + "Can I talk to you about another stuff?", L_Begin; //should go to pachuas's regular chat if(countitem("ReedBundle") < 5) goto L_EasterNotEnough; if(countitem("ReedBundle") >= 5) goto L_EasterEnough; @@ -305,6 +304,6 @@ L_SeeBunny: mes ""; mes "\"You need to return to the Easter Bunny now.\""; next; - goto L_Miriam_Check; + goto L_Begin; } |