From bba3e690de390f1576d70f227f76b4721ac3a010 Mon Sep 17 00:00:00 2001 From: Haru Date: Tue, 21 Oct 2014 21:03:46 +0200 Subject: Removed use of 'checkquest' from scripts (re folder) Signed-off-by: Haru --- npc/re/quests/eden/11-25.txt | 20 ++++++------ npc/re/quests/eden/26-40.txt | 16 +++++----- npc/re/quests/eden/41-55.txt | 9 ++++-- npc/re/quests/eden/56-70.txt | 10 +++--- npc/re/quests/eden/71-85.txt | 21 +++++++------ npc/re/quests/eden/86-90.txt | 16 +++++----- npc/re/quests/eden/91-99.txt | 16 +++++----- npc/re/quests/eden/eden_quests.txt | 60 ++++++++++++++++++------------------ npc/re/quests/eden/eden_tutorial.txt | 52 +++++++++++++++---------------- 9 files changed, 112 insertions(+), 108 deletions(-) (limited to 'npc/re/quests/eden') diff --git a/npc/re/quests/eden/11-25.txt b/npc/re/quests/eden/11-25.txt index 200454e81..17f5edb22 100644 --- a/npc/re/quests/eden/11-25.txt +++ b/npc/re/quests/eden/11-25.txt @@ -20,10 +20,10 @@ moc_para01,36,38,3 script Mission [11 - 25]#Tuto 4_BOARD3,{ close; } for(set .@i,11124; .@i<11134; set .@i,.@i+1) - if (checkquest(.@i,PLAYTIME) == 2) erasequest .@i; + if (questprogress(.@i,PLAYTIME) == 2) erasequest .@i; for(set .@i,11114; .@i<11123; set .@i,.@i+1) { - set .@j, checkquest(.@i,HUNTING); - if (.@j == 2) { + .@state = questprogress(.@i,HUNTING); + if (.@state == 2) { mes " - You must collect your - "; mes " - reward before starting - "; mes " - a new mission. - "; @@ -31,7 +31,7 @@ moc_para01,36,38,3 script Mission [11 - 25]#Tuto 4_BOARD3,{ mes " - Manager : Spike - "; close; } - else if (.@j >= 0) { + else if (.@state) { mes " - You can only request - "; mes " - one mission at a time. - "; mes " "; @@ -71,7 +71,7 @@ moc_para01,36,38,3 script Mission [11 - 25]#Tuto 4_BOARD3,{ } end; L_Quest: - if (checkquest(getarg(0),PLAYTIME) == 1) { + if (questprogress(getarg(0),PLAYTIME) == 1) { mes " - Mission ^4d4dff"+getarg(1)+"^000000 - "; mes " - is already finished for today. - "; mes " "; @@ -91,7 +91,7 @@ L_Quest: } for(set .@i,2; .@i= 0) { + else if (.@state) { mes "[Spike]"; mes "You haven't finished your mission yet."; mes "Keep up the good work. You are almost done."; @@ -127,7 +127,7 @@ moc_para01,32,30,6 script Spike 4_F_CHILD,{ mes "Why don't you look around and find some interesting tasks?"; close; L_Quest: - if (checkquest(getarg(0),HUNTING) == 2) { + if (questprogress(getarg(0),HUNTING) == 2) { if (getarg(3,0)) if (countitem(getarg(3)) < getarg(4)) { mes "[Spike]"; diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt index a4f0d5637..3ff9f5213 100644 --- a/npc/re/quests/eden/26-40.txt +++ b/npc/re/quests/eden/26-40.txt @@ -84,7 +84,7 @@ L_Quest: mes "You have declined the "+getarg(2)+" mission."; close; } - if (checkquest(getarg(0)) > -1) mes "You are already doing this mission."; + if (questprogress(getarg(0))) mes "You are already doing this mission."; else { setquest getarg(0); mes "You have accepted the "+getarg(2)+" mission."; @@ -134,8 +134,8 @@ geffen,103,42,5 script Sponiac 4W_M_03,{ end; L_Quest: //QuestID,Quest,BExp,JExp,PotionAmt,Desc - if (checkquest(getarg(0)) == 1) { - if (checkquest(getarg(0),HUNTING) == 2) { + if (questprogress(getarg(0)) == 1) { + if (questprogress(getarg(0),HUNTING) == 2) { mes "[Sponiac]"; mes getarg(1)+"!"; mes "Wow, I didn't expect you would do that mission. I was just about to give up. But you did good job. I appreciate it!"; @@ -209,7 +209,7 @@ moc_ruins,173,55,3 script Dieshin Man 4_M_ORIENT02,{ } end; L_Quest: - if (checkquest(getarg(0)) != 1) { + if (questprogress(getarg(0)) != 1) { mes "[Dieshin Man]"; mes "Huh? Are you sure? Something is wrong..."; next; @@ -281,7 +281,7 @@ pay_fild07,83,89,7 script Zoologist 4_M_ORIENT02,{ mes "Oh, I need an Insecticide to continue the study."; close; } - if (checkquest(8271) != 1) { + if (questprogress(8271) != 1) { mes "[Zoologist]"; mes "Huh?"; mes "You are not Dieshin's delivery man?"; @@ -346,7 +346,7 @@ prt_fild03,30,254,3 script Entomologist 4_M_01,{ mes "Oh, I need Honey to continue the study."; close; } - if (checkquest(8272) != 1) { + if (questprogress(8272) != 1) { mes "[Entomologist]"; mes "Huh?"; mes "You are not Dieshin's delivery man?"; @@ -411,7 +411,7 @@ xmas_fild01,92,57,3 script Biologist 4W_M_01,{ mes "Huh, whatever. But be careful! It's very slippery here."; close; } - if (checkquest(8273) != 1) { + if (questprogress(8273) != 1) { mes "[Biologist]"; mes "Huh?"; mes "You are not Dieshin's delivery man?"; @@ -645,7 +645,7 @@ payon,179,66,3 script Dashia 4_M_RACHMAN1,{ mes "Anyway, I will be here waiting for you. Please come back when you finish the mission!"; close; L_Quest: - if (checkquest(getarg(0)) != 1) { + if (questprogress(getarg(0)) != 1) { mes "[Dashia]"; mes "Huh? Are you sure? Something is wrong..."; next; diff --git a/npc/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt index eb1c22e42..7898060b5 100644 --- a/npc/re/quests/eden/41-55.txt +++ b/npc/re/quests/eden/41-55.txt @@ -22,7 +22,7 @@ moc_para01,40,38,3 script Mission [41 - 55] 4_BOARD3,{ mes "You cannot receive any more items because you're carrying too many items. Please try again after you lighten up.^000000"; close; } - if (checkquest(12088) == -1) { + if (!questprogress(12088)) { if (BaseLevel < 41 || BaseLevel > 55) { mes "Mission bulletin board for Lv41~55 adventurers."; close; @@ -56,7 +56,7 @@ moc_para01,40,38,3 script Mission [41 - 55] 4_BOARD3,{ } setarray .@exp[0],9600,7200,15750,7875,11100,8550,17100,9000,12300,9900,20250,10350,13800,11025,22500,11250; for(set .@i,0; .@i<16; set .@i,.@i+1) - if (checkquest(12072+.@i,HUNTING) == 2) { + if (questprogress(12072+.@i,HUNTING) == 2) { mes "[Mission Board]"; mes "You have completed the mission."; mes "Here is your reward."; @@ -66,7 +66,10 @@ moc_para01,40,38,3 script Mission [41 - 55] 4_BOARD3,{ getexp .@exp[.@i],0; close; } - if ((checkquest(12072,HUNTING) == 0) && (checkquest(12073,HUNTING) == 0) && (checkquest(12074,HUNTING) == 0) && (checkquest(12075,HUNTING) == 0) && (checkquest(12076,HUNTING) == 0) && (checkquest(12077,HUNTING) == 0) && (checkquest(12078,HUNTING) == 0) && (checkquest(12079,HUNTING) == 0) && (checkquest(12080,HUNTING) == 0) && (checkquest(12081,HUNTING) == 0) && (checkquest(12082,HUNTING) == 0) && (checkquest(12083,HUNTING) == 0) && (checkquest(12084,HUNTING) == 0) && (checkquest(12085,HUNTING) == 0) && (checkquest(12086,HUNTING) == 0) && (checkquest(12087,HUNTING) == 0)) { + if (!questprogress(12072,HUNTING) && !questprogress(12073,HUNTING) && !questprogress(12074,HUNTING) && !questprogress(12075,HUNTING) + && !questprogress(12076,HUNTING) && !questprogress(12077,HUNTING) && !questprogress(12078,HUNTING) && !questprogress(12079,HUNTING) + && !questprogress(12080,HUNTING) && !questprogress(12081,HUNTING) && !questprogress(12082,HUNTING) && !questprogress(12083,HUNTING) + && !questprogress(12084,HUNTING) && !questprogress(12085,HUNTING) && !questprogress(12086,HUNTING) && !questprogress(12087,HUNTING)) { mes "You may now view the bulletin board."; erasequest 12088; close; diff --git a/npc/re/quests/eden/56-70.txt b/npc/re/quests/eden/56-70.txt index c7e5103a8..c014da7d1 100644 --- a/npc/re/quests/eden/56-70.txt +++ b/npc/re/quests/eden/56-70.txt @@ -51,7 +51,7 @@ moc_para01,42,38,3 script Mission [56 - 70] 4_BOARD3,{ end; L_Quest: - if (checkquest(getarg(0)) == -1) { + if (!questprogress(getarg(0))) { callsub L_Details, getarg(0); next; mes "Would you like to accept this mission?"; @@ -74,7 +74,7 @@ L_Quest: else set .@items,2; //complete } - if (checkquest(getarg(0)) < 2 && (countitem(getarg(3)) < getarg(4) || .@items == 1)) { + if (questprogress(getarg(0)) != 2 && (countitem(getarg(3)) < getarg(4) || .@items == 1)) { mes "You have an on-going mission. Would you like to check the details?"; next; if(select("Check the details.:Cancel.") == 1) @@ -96,7 +96,7 @@ L_Quest: end; L_HuntingQuest: - if (checkquest(getarg(0)) == -1) { + if (!questprogress(getarg(0))) { callsub L_Details, getarg(0); next; mes "Would you like to accept this mission?"; @@ -119,13 +119,13 @@ L_HuntingQuest: else set .@items,2; //complete } - if (checkquest(getarg(0),HUNTING) < 2 || .@items == 1) { + if (questprogress(getarg(0),HUNTING) != 2 || .@items == 1) { mes "You have an on-going mission. Would you like to check the details?"; next; if(select("Check the details.:Cancel.") == 1) callsub L_Details, getarg(0); close; - } else if (checkquest(getarg(0),HUNTING) == 2) { + } else if (questprogress(getarg(0),HUNTING) == 2) { mes "I have done pretty well for the mission. Should I report it now?"; next; if(select("Report the mission.:Do not report it yet.") == 1) { diff --git a/npc/re/quests/eden/71-85.txt b/npc/re/quests/eden/71-85.txt index 57102982c..f2ea5f2a1 100644 --- a/npc/re/quests/eden/71-85.txt +++ b/npc/re/quests/eden/71-85.txt @@ -23,9 +23,9 @@ moc_para01,44,38,3 script Mission [71 - 85] 4_BOARD3,{ // Clear the original quest data (no longer used). if (slv_quest) set slv_quest,0; - if (checkquest(10102) > -1 || checkquest(10103) > -1 || checkquest(10104) > -1 || checkquest(10105) > -1 || checkquest(10106) > -1) { + if (questprogress(10102) || questprogress(10103) || questprogress(10104) || questprogress(10105) || questprogress(10106)) { for(set .@quest,10102; .@quest<=10106; set .@quest,.@quest+1) { - if (checkquest(.@quest) > -1) + if (questprogress(.@quest)) erasequest .@quest; } mes "- Since the client has moved -"; @@ -50,10 +50,10 @@ moc_para01,44,38,3 script Mission [71 - 85] 4_BOARD3,{ 10118,10119,10120, 10121,10122,10123,5055,5056; for(set .@i,0; .@i -1 && countitem(7187) >= 30) + if (questprogress(5057) && countitem(7187) >= 30) set .@complete[getarraysize(.@complete)],5057; if (getarraysize(.@complete)) { mes "You have quests in progress."; @@ -184,13 +184,14 @@ L_Quest: } else { if (.@quest == 5057) { // Quest 5057 is the only collection quest, so separate conditions are unnecessary. - if (checkquest(5057) == -1) - set .@hunting,-1; + if (!questprogress(5057)) + .@hunting = 0; else if (countitem(7187) >= 30) - set .@hunting,2; - } else - set .@hunting, checkquest(.@quest,HUNTING); - if (.@hunting == 0 || .@hunting == 1) { + .@hunting = 2; + } else { + .@hunting = questprogress(.@quest,HUNTING); + } + if (.@hunting == 1) { mes getarg(1); mes getarg(2); next; diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt index 01c8fec29..2431670a0 100644 --- a/npc/re/quests/eden/86-90.txt +++ b/npc/re/quests/eden/86-90.txt @@ -78,8 +78,8 @@ moc_para01,48,175,3 script 86-90 Mission Board 4_BOARD3,{ 72000,72000,72000,86000,80000; mes "You must be within level 86-90 to accept these missions."; for(set .@quest,4167; .@quest<=4180; set .@quest,.@quest+1) { - set .@hunting, checkquest(.@quest,HUNTING); - if (.@hunting == 0 || .@hunting == 1) { + .@hunting = questprogress(.@quest,HUNTING); + if (.@hunting == 1) { next; mes ":: You cannot proceed in"; mes ":: ^0000FF"+.@names$[.@quest-4167]+" Hunting^000000."; @@ -152,14 +152,14 @@ moc_para01,48,175,3 script 86-90 Mission Board 4_BOARD3,{ L_Quest: set .@quest1, getarg(0); set .@quest2, .@quest1+31; - set .@playtime, checkquest(.@quest2,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(.@quest2,PLAYTIME); + if (.@playtime == 1) { mes "[86-90 Mission Board]"; mes "You need to wait 3 hours before you can take this mission again."; close; } - set .@hunting, checkquest(.@quest1,HUNTING); - if (.@hunting == 0 || .@hunting == 1) { + .@hunting = questprogress(.@quest1,HUNTING); + if (.@hunting == 1) { mes "[86-90 Mission Board]"; mes "Have you finished hunting all 30 "+getarg(1)+getarg(5,"")+" yet?"; close; @@ -168,7 +168,7 @@ L_Quest: mes "You have completed the hunting."; mes "Please accept this reward as a compensation."; erasequest .@quest1; - if (.@playtime > -1) erasequest .@quest2; + if (.@playtime) erasequest .@quest2; setquest .@quest2; getexp getarg(2),0; close; @@ -190,7 +190,7 @@ L_Quest: if(select("I'll hunt them.:No thanks.") == 1) { mes "[86-90 Mission Board]"; mes "When you have completed the mission, post it on this board and collect your reward."; - if (.@playtime > -1) erasequest .@quest2; + if (.@playtime) erasequest .@quest2; setquest .@quest1; } close; diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt index e6744e80f..707cde268 100644 --- a/npc/re/quests/eden/91-99.txt +++ b/npc/re/quests/eden/91-99.txt @@ -80,8 +80,8 @@ moc_para01,48,177,3 script 91-99 Mission Board 4_BOARD3,{ 110000,138000,118000,96000,134000; mes "You must be within level 91-99 to accept these missions."; for(set .@quest,4181; .@quest<=4196; set .@quest,.@quest+1) { - set .@hunting, checkquest(.@quest,HUNTING); - if (.@hunting == 0 || .@hunting == 1) { + .@hunting = questprogress(.@quest,HUNTING); + if (.@hunting == 1) { next; mes ":: You cannot proceed in"; mes ":: ^0000FF"+.@names$[.@quest-4181]+" Hunting^000000."; @@ -161,14 +161,14 @@ moc_para01,48,177,3 script 91-99 Mission Board 4_BOARD3,{ L_Quest: set .@quest1, getarg(0); set .@quest2, .@quest1+31; - set .@playtime, checkquest(.@quest2,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(.@quest2,PLAYTIME); + if (.@playtime == 1) { mes "[91-99 Mission Board]"; mes "You need to wait 3 hours before you can take this mission again."; close; } - set .@hunting, checkquest(.@quest1,HUNTING); - if (.@hunting == 0 || .@hunting == 1) { + .@hunting = questprogress(.@quest1,HUNTING); + if (.@hunting == 1) { mes "[91-99 Mission Board]"; mes "Have you finished hunting all 30 "+getarg(1)+getarg(5,"")+" yet?"; close; @@ -177,7 +177,7 @@ L_Quest: mes "You have completed the hunting."; mes "Please accept this reward as a compensation."; erasequest .@quest1; - if (.@playtime > -1) erasequest .@quest2; + if (.@playtime) erasequest .@quest2; setquest .@quest2; // Job Experience calculation. @@ -207,7 +207,7 @@ L_Quest: if(select("I'll hunt them.:No thanks.") == 1) { mes "[91-99 Mission Board]"; mes "When you have completed the mission, post it on this board and collect your reward."; - if (.@playtime > -1) erasequest .@quest2; + if (.@playtime) erasequest .@quest2; setquest .@quest1; } close; diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index f1b54a9e7..6b98b217e 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -1139,7 +1139,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 4_RUS_DWOLF,{ } } if (para_suv01 == 2) { - if (checkquest(7129,HUNTING) == 2) { + if (questprogress(7129,HUNTING) == 2) { mes "[Talking Dog]"; mes "Woooohh..."; mes "Great!"; @@ -1186,7 +1186,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 4_RUS_DWOLF,{ close; } if (para_suv01 == 3) { - if (checkquest(7130,HUNTING) == 2) { + if (questprogress(7130,HUNTING) == 2) { mes "[Talking Dog]"; mes "You are so perfect."; next; @@ -1224,7 +1224,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 4_RUS_DWOLF,{ close; } if (para_suv01 == 4) { - if (checkquest(7131,HUNTING) == 2) { + if (questprogress(7131,HUNTING) == 2) { mes "[Talking Dog]"; mes "Um. Excellent."; mes "You are awesome!"; @@ -1388,7 +1388,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 4_M_BABYCAT,{ } } if (para_suv01 == 7) { - if (checkquest(7134,HUNTING) == 2) { + if (questprogress(7134,HUNTING) == 2) { mes "[Timid Cat]"; mes "Now do you understand the dirty and humid underground sewers?"; mes "Eeeh look what's next meow."; @@ -1426,7 +1426,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 4_M_BABYCAT,{ close; } if (para_suv01 == 8) { - if (checkquest(7135,HUNTING) == 2) { + if (questprogress(7135,HUNTING) == 2) { mes "[Timid Cat]"; mes "Great job~!"; mes "How'd you get rid of those dirty bugs and Tarou. You are brave."; @@ -1464,7 +1464,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 4_M_BABYCAT,{ close; } if (para_suv01 == 9) { - if (checkquest(7136,HUNTING) == 2) { + if (questprogress(7136,HUNTING) == 2) { mes "[Timid Cat]"; mes "You are great meow~"; mes "You killed them so quickly!"; @@ -1572,7 +1572,7 @@ pay_arche,41,136,3 script Eden Member Karl#para05 4_M_KHMAN,{ close; } if (para_suv01 == 14) { - if (checkquest(7139,HUNTING) == 2) { + if (questprogress(7139,HUNTING) == 2) { mes "[Karl]"; mes "Did you get how the undead work?"; mes "As you know undead never die so, blessing of live person it's same as curse to them."; @@ -1611,7 +1611,7 @@ pay_arche,41,136,3 script Eden Member Karl#para05 4_M_KHMAN,{ close; } if (para_suv01 == 15) { - if (checkquest(7140,HUNTING) == 2) { + if (questprogress(7140,HUNTING) == 2) { mes "[Karl]"; mes "Did you get back what the Poporing stole?"; mes "This cave is really deep and there are lots of precious things that they could have picked up."; @@ -1734,7 +1734,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{ } } if (para_suv01 == 18) { - if (checkquest(7143,HUNTING) == 2) { + if (questprogress(7143,HUNTING) == 2) { mes "[Cloud]"; mes "Hey, what was it?"; mes "Maybe you saw an Andre when you were hunting Pierre."; @@ -1764,7 +1764,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{ close; } if (para_suv01 == 19) { - if (checkquest(7144,HUNTING) == 2) { + if (questprogress(7144,HUNTING) == 2) { mes "[Cloud]"; mes "Great. You seem to have killed all of the Andre."; mes "How do you think about fighting ants?"; @@ -1803,7 +1803,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{ close; } if (para_suv01 == 20) { - if (checkquest(7145,HUNTING) == 2) { + if (questprogress(7145,HUNTING) == 2) { mes "[Cloud]"; mes "Oh... it might have been an anoying fight."; mes "You finished so fast."; @@ -1913,7 +1913,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ close; } if (para_suv01 == 25) { - if (checkquest(7148,HUNTING) == 2) { + if (questprogress(7148,HUNTING) == 2) { mes "[Hooksha]"; mes "Great. Awesome."; mes "It's not very pleasant so let's move on."; @@ -1946,7 +1946,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ close; } if (para_suv01 == 26) { - if (checkquest(7149,HUNTING) == 2) { + if (questprogress(7149,HUNTING) == 2) { mes "[Hooksha]"; mes "Now you can move on to the next step."; next; @@ -1977,7 +1977,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ close; } if (para_suv01 == 27) { - if (checkquest(7150,HUNTING) == 2) { + if (questprogress(7150,HUNTING) == 2) { mes "[Hooksha]"; mes "Great job."; mes "Now you should understand how the orc tribe works here in Orc Village."; @@ -2044,7 +2044,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ close; } if (para_suv01 == 30) { - if (checkquest(7153,HUNTING) == 2) { + if (questprogress(7153,HUNTING) == 2) { mes "[Hooksha]"; mes "It's different from what you saw in Payon, right?"; mes "Although you managed to kill the Orc Zombies, you can't be sure you are much stronger.."; @@ -2076,7 +2076,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ close; } if (para_suv01 == 31) { - if (checkquest(7154,HUNTING) == 2) { + if (questprogress(7154,HUNTING) == 2) { mes "[Hooksha]"; mes "Your training mission has been completed."; mes "Go back to the Eden Group headquarters and report."; @@ -2172,7 +2172,7 @@ iz_dun04,43,46,3 script Eden Member Callandiva 4_F_CRU,{ close; } if (para_suv01 == 34) { - if (checkquest(7157,HUNTING) == 2) { + if (questprogress(7157,HUNTING) == 2) { mes "[Callandiva]"; mes "Oh, you came back~!"; mes "What did you think of those threatening Mermans?"; @@ -2203,7 +2203,7 @@ iz_dun04,43,46,3 script Eden Member Callandiva 4_F_CRU,{ close; } if (para_suv01 == 35) { - if (checkquest(7158,HUNTING) == 2) { + if (questprogress(7158,HUNTING) == 2) { mes "[Callandiva]"; mes "Did you kill all the Strouf already?"; mes "I wasn't counting that you'd make it."; @@ -4000,7 +4000,7 @@ comodo,173,354,6 script Romeo#01 1_M_JOBTESTER,{ close; } if (romeo == 1) { - if (checkquest(7215,HUNTING) == 2) { + if (questprogress(7215,HUNTING) == 2) { mes "[Romeo]"; mes "You did it? Thats all the proof I needed."; next; @@ -4033,7 +4033,7 @@ comodo,173,354,6 script Romeo#01 1_M_JOBTESTER,{ um_fild01,34,280,6 script Romeo#02 1_M_JOBTESTER,{ if (romeo == 2) { - if (checkquest(7216,HUNTING) == 2) { + if (questprogress(7216,HUNTING) == 2) { mes "[Romeo]"; mes "Wow, you have arrived sooner than I expected."; next; @@ -4098,7 +4098,7 @@ glast_01,195,131,6 script Johan 4_F_SISTER,{ close; } if (johan == 1) { - if (checkquest(7220,HUNTING) == 2) { + if (questprogress(7220,HUNTING) == 2) { mes "[Johan]"; mes "Good."; next; @@ -4117,7 +4117,7 @@ glast_01,195,131,6 script Johan 4_F_SISTER,{ close; } if (johan == 2) { - if (checkquest(7221,HUNTING) == 2) { + if (questprogress(7221,HUNTING) == 2) { mes "[Johan]"; mes "Hmmmm, better."; next; @@ -4163,7 +4163,7 @@ ein_fild08,172,359,4 script Kiren 4_M_4THPRIN1,{ close; } if (kiren == 1) { - if (checkquest(7224,HUNTING) == 2) { + if (questprogress(7224,HUNTING) == 2) { mes "[Kiren]"; mes "Wow, most people spend twice as long as you did to kill those Porcellios!"; next; @@ -4183,7 +4183,7 @@ ein_fild08,172,359,4 script Kiren 4_M_4THPRIN1,{ close; } if (kiren == 2) { - if ((checkquest(7226,HUNTING) == 2) && (checkquest(7227,HUNTING) == 2)) { + if ((questprogress(7226,HUNTING) == 2) && (questprogress(7227,HUNTING) == 2)) { mes "[Kiren]"; mes "Incredible, you set a new record!"; next; @@ -4230,7 +4230,7 @@ ice_dun01,154,13,6 script Naomi 4_F_JOB_BLACKSMITH,{ close; } if (naomi == 1) { - if (checkquest(7230,HUNTING) == 2) { + if (questprogress(7230,HUNTING) == 2) { mes "[Naomi]"; mes "Thank you, but there are still so many Siromas here!"; next; @@ -4249,7 +4249,7 @@ ice_dun01,154,13,6 script Naomi 4_F_JOB_BLACKSMITH,{ close; } if (naomi == 2) { - if ((checkquest(7231,HUNTING) == 2) && (countitem(7066) >= 30) && (countitem(519) >= 1) && (countitem(7453) >= 1)) { + if ((questprogress(7231,HUNTING) == 2) && (countitem(7066) >= 30) && (countitem(519) >= 1) && (countitem(7453) >= 1)) { mes "[Naomi]"; mes "Yay, you did it!"; next; @@ -4349,7 +4349,7 @@ man_fild01,43,234,2 script Paradise Dispatch#01 4_DST_SOLDIER,{ close; } if (margaret == 2) { - if (checkquest(7235,HUNTING) == 2) { + if (questprogress(7235,HUNTING) == 2) { mes "[Paradise Dispatch]"; mes "Thanks!"; next; @@ -4395,7 +4395,7 @@ spl_fild02,377,149,4 script Paradise Dispatch#02 4_M_DST_MASTER,{ close; } if (margaret == 5) { - if (checkquest(7236,HUNTING) == 2) { + if (questprogress(7236,HUNTING) == 2) { mes "[Paradise Dispatch]"; mes "You make it look so easy, but I couldn't even kill 1..."; next; @@ -4701,12 +4701,12 @@ moc_para01,111,83,3 script Toren 2_M_OLDBLSMITH,{ mes "It is finished! Come back tomorrow if you want to enchant more."; close; } - if ((paragearenchant == 4) && (checkquest(7241,PLAYTIME) != 2)) { + if ((paragearenchant == 4) && (questprogress(7241,PLAYTIME) != 2)) { mes "[Toren]"; mes "Please come back tomorrow if you want to enchant more."; close; } - if ((paragearenchant == 4) && (checkquest(7241,PLAYTIME) == 2)) { + if ((paragearenchant == 4) && (questprogress(7241,PLAYTIME) == 2)) { set paragearenchant,0; erasequest 7241; mes "[Toren]"; diff --git a/npc/re/quests/eden/eden_tutorial.txt b/npc/re/quests/eden/eden_tutorial.txt index 92cfb26fd..408ba83df 100644 --- a/npc/re/quests/eden/eden_tutorial.txt +++ b/npc/re/quests/eden/eden_tutorial.txt @@ -14,7 +14,7 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ if (Class == Job_Novice) { // Fall through - } else if (checkquest(9167) == -1) { + } else if (!questprogress(9167)) { OnStartQuest: if (@tutorial_restart) { set .@tutorial_restart,1; @@ -85,7 +85,7 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ mes "When you're not so busy, come find me again."; close; } - } else if (checkquest(9167) == 0 || checkquest(9167) == 1) { + } else if (questprogress(9167) == 1) { if (!getmercinfo(1)) { mes "[Tutorial Instructor]"; mes "You haven't gotten a mercenary yet."; @@ -146,7 +146,7 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ completequest 9167; setquest 9168; close; - } else if (checkquest(9168) == 0 || checkquest(9168) == 1) { + } else if (questprogress(9168) == 1) { if (checkweight(607,1) == 0) { if (MaxWeight - Weight < getiteminfo(607,6)) { mes "[Tutorial Instructor]"; @@ -237,7 +237,7 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ mes "the ^006400Quest Window^000000,"; mes "come find and talk to me again."; close; - } else if (checkquest(9169) == 0 || checkquest(9169) == 1) { + } else if (questprogress(9169) == 1) { if (countitem(12580) == 0) { mes "[Tutorial Instructor]"; mes "Hmm? So I noticed that"; @@ -280,7 +280,7 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ completequest 9169; setquest 9170; close; - } else if (checkquest(9170) == 0 || checkquest(9170) == 1) { + } else if (questprogress(9170) == 1) { if (countitem(12580)) { mes "[Tutorial Instructor]"; mes "Hmm... It seems that you still have"; @@ -319,7 +319,7 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ completequest 9170; setquest 9171; close; - } else if (checkquest(9171) == 0 || checkquest(9171) == 1) { + } else if (questprogress(9171) == 1) { if (countitem(909) < 10) { mes "[Tutorial Instructor]"; mes "It seems you didn't bring"; @@ -401,7 +401,7 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ mes "When you're done looking at them,"; mes "give them back to me."; close; - } else if (checkquest(9172) == 0 || checkquest(9172) == 1) { + } else if (questprogress(9172) == 1) { if (countitem(15033) == 0 || countitem(15034) == 0) { mes "[Tutorial Instructor]"; mes "What did you do with the Enchanted"; @@ -438,13 +438,13 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ mes "then bring them back to me."; close; } - } else if (checkquest(9173) == 0 || checkquest(9173) == 1) { + } else if (questprogress(9173) == 1) { mes "[Tutorial Instructor]"; mes "Do you have any questions?"; next; switch(select("Can I do the same quest again?:About the Quest Window...:About ENCHANT...:About Searching Vends...:About Mercenary and Pets...:End Conversation.")) { case 1: - if (checkquest(9173,PLAYTIME) == 0 || checkquest(9173,PLAYTIME) == 1) { + if (questprogress(9173,PLAYTIME) == 1) { mes "[Tutorial Instructor]"; mes "The one method to do the same quests repeatdedly is to do the ^006400Daily Quests^000000."; next; @@ -579,32 +579,32 @@ moc_para01,32,179,4 script Tutorial Goal 4_F_KHELLY,{ close; } } - if (checkquest(4161) == 0 || checkquest(4161) == 1) { + if (questprogress(4161) == 1) { mes "[Tutorial Goal]"; mes "Well~ We gotta go challenge the experts right?"; mes "Let's start off by finding the ^006400Siege Expert^000000!"; close; - } else if (checkquest(4162) == 0 || checkquest(4162) == 1) { + } else if (questprogress(4162) == 1) { mes "[Tutorial Goal]"; mes "You've passed the ^006400Siege Expert^000000's test! Congrats!"; mes "Now, go find the ^006400Party Recruiting Expert^000000!"; close; - } else if (checkquest(4163) == 0 || checkquest(4163) == 1) { + } else if (questprogress(4163) == 1) { mes "[Tutorial Goal]"; mes "Oh! You've passed the ^006400Party Recruiting Expert^000000's test! Congrats!"; mes "Now, go find the ^006400Battleground Expert^000000!"; close; - } else if (checkquest(4164) == 0 || checkquest(4164) == 1) { + } else if (questprogress(4164) == 1) { mes "[Tutorial Goal]"; mes "Yay! You passed the test from the ^006400Battleground Expert^000000! Congrats!"; mes "Next, go and find the ^006400Memorial Dungeon Expert^000000!"; close; - } else if (checkquest(4165) == 0 || checkquest(4165) == 1) { + } else if (questprogress(4165) == 1) { mes "[Tutorial Goal]"; mes "You passed the test from ^006400Memorial Dungeon Expert^000000! That's great!"; mes "Try finding the ^006400Map Expert^000000!"; close; - } else if (checkquest(4166) == 0 || checkquest(4166) == 1) { + } else if (questprogress(4166) == 1) { mes "[Tutorial Goal]"; mes "You passed ^006400Map Expert^000000's test! Congrats!"; mes "I'm so glad that you were to pass all the Experts' tests! You're better than I expected!!"; @@ -621,7 +621,7 @@ moc_para01,32,179,4 script Tutorial Goal 4_F_KHELLY,{ getitem 504,5; //White_Potion getitem 608,1; //Seed_Of_Yggdrasil close; - } else if (checkquest(4166) == 2) { + } else if (questprogress(4166) == 2) { mes "[Tutorial Goal]"; mes "Now, even you are an ^006400Expert^000000!! Such a fitting nick name for you!"; mes "Thank you so much for your hard work."; @@ -662,7 +662,7 @@ moc_para01,32,179,4 script Tutorial Goal 4_F_KHELLY,{ } moc_para01,24,175,4 script Siege Master 4_M_JOB_KNIGHT2,{ - set .@checkquest, checkquest(4161); + .@checkquest = questprogress(4161); if (.@checkquest == 2) { mes "[Siege Expert]"; mes "Since you've come again, I assume you're curious about ^006400Siege^000000?"; @@ -678,7 +678,7 @@ moc_para01,24,175,4 script Siege Master 4_M_JOB_KNIGHT2,{ mes "If you want to go over anything, just come talk to me."; close; } - } else if (.@checkquest == 0 || .@checkquest == 1) { + } else if (.@checkquest == 1) { mes "[Siege Expert]"; mes "I am someone who has studied War of Emperium for 16 years! So that makes me an expert! Since you came to find me, I assume you want to learn more about ^006400Siege^000000."; next; @@ -835,7 +835,7 @@ L_Info: } moc_para01,21,172,4 script Party Recruiting Expert 4_M_OILMAN,{ - set .@checkquest, checkquest(4162); + .@checkquest = questprogress(4162); if (.@checkquest == 2) { mes "[Party Recruiting Expert]"; mes "Since you've come and found me, it seems you're curious about ^006400Party Recruiting^000000?"; @@ -851,7 +851,7 @@ moc_para01,21,172,4 script Party Recruiting Expert 4_M_OILMAN,{ mes "Well, if you have any questions, come find me."; close; } - } else if (.@checkquest == 0 || .@checkquest == 1) { + } else if (.@checkquest == 1) { mes "[Party Recruiting Expert]"; mes "I am the ^006400Party Recruiting^000000 expert because I did research about Party Recruting for 16 years! It seems that the ^006400Siege Expert^000000 sent you my way since you passed his tests, hmm?"; next; @@ -1017,7 +1017,7 @@ L_Info: } moc_para01,12,179,6 script Battleground Master 4_M_KY_HEAD,{ - set .@checkquest, checkquest(4163); + .@checkquest = questprogress(4163); if (.@checkquest == 2) { mes "[Battleground Expert]"; mes "Seeing that you sought me out, I guess you want to learn about ^006400Battleground^000000s, eh?"; @@ -1033,7 +1033,7 @@ moc_para01,12,179,6 script Battleground Master 4_M_KY_HEAD,{ mes "If you want to go over anything, let me know."; close; } - } else if (.@checkquest == 0 || .@checkquest == 1) { + } else if (.@checkquest == 1) { mes "[Battleground Expert]"; mes "For 16 years, I experienced the intense heat of battle on the ^006400Battleground^000000s... I am the ^006400Battleground^000000 Expert!"; mes "It seems that the ^006400Party Recruiting Expert^000000 sent you to me since you passed his quiz."; @@ -1197,7 +1197,7 @@ L_Info: } moc_para01,28,167,3 script Memorial Dungeon Expert 4_M_LGTGUARD,{ - set .@checkquest, checkquest(4164); + .@checkquest = questprogress(4164); if (.@checkquest == 2) { mes "[Memorial Dungeon Expert]"; mes "Since you've come here, it seems you want to learn about the ^006400Memorial Dungeon^000000."; @@ -1213,7 +1213,7 @@ moc_para01,28,167,3 script Memorial Dungeon Expert 4_M_LGTGUARD,{ mes " If you want to hear about it again, come find me."; close; } - } else if (.@checkquest == 0 || .@checkquest == 1) { + } else if (.@checkquest == 1) { mes "[Memorial Dungeon Expert]"; mes "I am the ^006400Memorial Dungeon^000000 Expert! I studied the ^006400Memorial Dungeon^000000 for 16 years!"; mes "Since you've sought me out, I assume that you've passed the ^006400Battleground Expert^000000's quiz."; @@ -1375,7 +1375,7 @@ L_Info: } moc_para01,14,168,6 script Map Expert 2_M_SAGE_OLD,{ - set .@checkquest, checkquest(4165); + .@checkquest = questprogress(4165); if (.@checkquest == 2) { mes "[Map Expert]"; mes "Seeing that you came to me, I assume you have some questions about ^006400MAP^000000s?"; @@ -1392,7 +1392,7 @@ moc_para01,14,168,6 script Map Expert 2_M_SAGE_OLD,{ mes "If you have any more questions, come find me."; close; } - } else if (.@checkquest == 0 || .@checkquest == 1) { + } else if (.@checkquest == 1) { mes "[Map Expert]"; mes "I have been researching and studying ^006400MAP^000000s for 16 years and so now I am the ^006400MAP^000000 Expert!"; mes "Since you've sought me out, it seems you've passed ^006400Memorial Dungeon Expert^000000's quiz."; -- cgit v1.2.3-60-g2f50