From 32169c383f2658192b6b8cb02d7f818a361dda03 Mon Sep 17 00:00:00 2001 From: Haru Date: Mon, 20 Oct 2014 04:20:29 +0200 Subject: Removed use of 'checkquest' from scripts (common folder) Signed-off-by: Haru --- npc/quests/quests_13_1.txt | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'npc/quests/quests_13_1.txt') diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 16860ddf2..a66038181 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -4145,7 +4145,7 @@ mid_camp,188,254,3 script Monster Scholar#ep13 4_M_ALCHE_D,{ close; } else if (ep13_animal == 14) { - if (checkquest(2157,HUNTING) == 2) { + if (questprogress(2157,HUNTING) == 2) { mes "[Rumis Block]"; mes "Welcome back. Did you find out about them?"; next; @@ -4498,7 +4498,7 @@ mid_camp,240,270,3 script Botanist#ep13 4_M_ALCHE_C,{ close; } else if (ep13_animal == 5) { - if (checkquest(2150,HUNTING) == 2) { + if (questprogress(2150,HUNTING) == 2) { mes "[Botanist]"; mes "Welcome back! How was it?"; mes "It was amazing, wasn't it?"; @@ -4561,7 +4561,7 @@ mid_camp,240,270,3 script Botanist#ep13 4_M_ALCHE_C,{ } } else if (ep13_animal == 6) { - if (checkquest(2151,HUNTING) == 2) { + if (questprogress(2151,HUNTING) == 2) { mes "[Botanist]"; mes "Hopefully the Cornuses have learned their lesson, and won't touch my special environmental meters anymore."; next; @@ -4843,7 +4843,7 @@ man_fild01,92,230,3 script Frozen Tree#evt_lumis HIDDEN_NPC,1,1,{ //============================================================ spl_fild02,34,223,5 script Small Fairy#spl 4_M_FAIRYKID,{ if (BaseLevel > 69) { - if (checkquest(2158) == -1) { + if (!questprogress(2158)) { mes "You find a little creature flying in the bushes."; mes "It has tiny wings on the back..."; mes "It's a fairy!"; @@ -4881,7 +4881,7 @@ spl_fild02,34,223,5 script Small Fairy#spl 4_M_FAIRYKID,{ man_fild03,236,105,3 script Tree Giant#man 4_MAN_PIOM,{ if (BaseLevel > 69) { - if (checkquest(2159) == -1) { + if (!questprogress(2159)) { mes "You have found something moving between dry branches."; mes "It appears to be a tree at first glance, but it turns out to be a giant that is half tree and half man."; next; @@ -4923,14 +4923,14 @@ mid_camp,212,237,5 script Camp Guard Captain#man1 4_M_EIN_SOLDIER,{ mes "working for United Midgard."; mes "How may I help you?"; next; - if ((checkquest(2158) == 2) && (checkquest(2159) == 2)) { + if (questprogress(2158) == 2 && questprogress(2159) == 2) { mes "["+strcharinfo(0)+"]"; mes "Oh, nothing."; mes "Sorry to bother you."; close; } else { - if (checkquest(2158) == 1) { + if (questprogress(2158) == 1) { mes "- You report your encounter with a small fairy in the Splandid area to the guard captain. -"; next; mes "[Captain]"; @@ -4944,14 +4944,14 @@ mid_camp,212,237,5 script Camp Guard Captain#man1 4_M_EIN_SOLDIER,{ getexp (checkre(3))?90000:900000,0; close; } - else if (checkquest(2158) == -1) { + else if (!questprogress(2158)) { mes "["+strcharinfo(0)+"]"; mes "Oh, nothing."; mes "Sorry to bother you."; close; } else { - if (checkquest(2159) == 1) { + if (questprogress(2159) == 1) { mes "- You report your encounter with a tree giant in the Manuk area to the guard captain. -"; next; mes "[Captain]"; @@ -7393,8 +7393,8 @@ mid_camp,143,306,5 script Breeder Taab#ep13_alba 4_M_DST_MASTER,{ } } else if (ep13_alba == 6) { - set .@alba_check,checkquest(7047,PLAYTIME); - if (.@alba_check == -1) { + .@alba_check = questprogress(7047,PLAYTIME); + if (!.@alba_check) { mes "[Taab]"; mes "Thank you for"; mes "helping me last time."; @@ -7406,7 +7406,7 @@ mid_camp,143,306,5 script Breeder Taab#ep13_alba 4_M_DST_MASTER,{ set ep13_alba,0; close; } - else if ((.@alba_check == 0) || (.@alba_check == 1)) { + else if (.@alba_check == 1) { mes "[Taab]"; mes "I've got enough feed"; mes "and supplies to last a while."; @@ -8084,7 +8084,7 @@ mid_camp,72,94,4 script Fluffy Gyaruk 4_M_BOSSCAT,{ } mid_camp,69,144,0 script Ferocious Gorurug 4_M_BOSSCAT,{ - if (checkquest(12060,PLAYTIME) == -1) { + if (!questprogress(12060,PLAYTIME)) { if (ep13_yong1 < 4) { mes "[Ferocious Gorurug]"; mes "Grrr...."; @@ -8233,7 +8233,7 @@ mid_camp,69,144,0 script Ferocious Gorurug 4_M_BOSSCAT,{ close; } } - else if ((checkquest(12060,PLAYTIME) == 0) || (checkquest(12060,PLAYTIME) == 1)) { + else if (questprogress(12060,PLAYTIME) == 1) { mes "[Ferocious Gorurug]"; mes "*Yawn*"; mes "I'm sorry, but I'm off-duty."; @@ -8252,7 +8252,7 @@ mid_camp,69,144,0 script Ferocious Gorurug 4_M_BOSSCAT,{ } spl_fild02,314,165,0 script School of Fish#1::Fishinghole CLEAR_NPC,{ - if ((checkquest(12060,PLAYTIME) == -1) && (countitem(6039) < 20)) { + if (!questprogress(12060,PLAYTIME) && countitem(6039) < 20) { specialeffect2 EF_BUBBLE; specialeffect2 EF_INVENOM; set .@fcast,15; @@ -8368,7 +8368,7 @@ mid_camp,66,122,55 script Henry Clifford 4_M_05,{ } mid_camp,88,100,55 script Cat Hand Mining Agent 4_CAT,{ - if (checkquest(12062,PLAYTIME) == -1) { + if (!questprogress(12062,PLAYTIME) == -1) { if ((countitem(6048) > 2) && (ep13_yong1 > 9)) { mes "[Cat Hand Mining Agent]"; mes "Oh, wow~"; @@ -8403,7 +8403,7 @@ mid_camp,88,100,55 script Cat Hand Mining Agent 4_CAT,{ close; } } - else if ((checkquest(12062,PLAYTIME) == 0) || (checkquest(12062,PLAYTIME) == 1)) { + else if (questprogress(12062,PLAYTIME) == 1) { mes "[Cat Hand Mining Agent]"; mes "I hope you'll bring me minerals again tomorrow..."; mes "If you can. It's much better to wait for you to do it than go there on my own."; @@ -8419,7 +8419,7 @@ mid_camp,88,100,55 script Cat Hand Mining Agent 4_CAT,{ } - script Mysterious Rock#0::manukrock -1,{ - if ((countitem(6048) < 3) && (checkquest(12062,PLAYTIME) == -1)) { + if (countitem(6048) < 3 && !questprogress(12062,PLAYTIME)) { specialeffect2 EF_REPAIRWEAPON; progressbar "ffff00",10; set .@rhea_ran,rand(1,20); @@ -10078,7 +10078,7 @@ man_fild01,315,95,3 script Expedition Scout#1 4_M_MOC_SOLDIER,{ next; mes "[Expedition Scout]"; mes "I've been ordered by Instructor Igrid to conduct a search for something."; - set .@playtime,checkquest(3091,PLAYTIME); + .@playtime = questprogress(3091,PLAYTIME); next; switch(select("Ask about search results.:Chitchat.:Quit.")) { case 1: @@ -10086,7 +10086,7 @@ man_fild01,315,95,3 script Expedition Scout#1 4_M_MOC_SOLDIER,{ mes "[Expedition Scout]"; mes "Oh, you must be"+strcharinfo(0)+". I heard that you'll be delivering the report."; next; - if (.@playtime == 0 || .@playtime == 1) { + if (.@playtime == 1) { mes "[Expedition Scout]"; mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round."; close; @@ -10116,7 +10116,7 @@ man_fild01,315,95,3 script Expedition Scout#1 4_M_MOC_SOLDIER,{ mes "I'm doing my best, but I haven't found any pages yet."; next; } - if (.@playtime == -1) { + if (!.@playtime) { changequest 3090,3091; erasequest 3090; } else -- cgit v1.2.3-70-g09d2