diff options
| author | Haru <haru@dotalux.com> | 2014-10-21 21:03:46 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2014-10-28 00:28:47 +0100 |
| commit | bba3e690de390f1576d70f227f76b4721ac3a010 (patch) | |
| tree | 5849259e9174eab76b65079f5617d4e509f099d1 | |
| parent | 88929e74e284e649eb32b2a923f819c35ecccbf6 (diff) | |
| download | hercules-bba3e690de390f1576d70f227f76b4721ac3a010.tar.gz hercules-bba3e690de390f1576d70f227f76b4721ac3a010.tar.bz2 hercules-bba3e690de390f1576d70f227f76b4721ac3a010.tar.xz hercules-bba3e690de390f1576d70f227f76b4721ac3a010.zip | |
Removed use of 'checkquest' from scripts (re folder)
Signed-off-by: Haru <haru@dotalux.com>
39 files changed, 790 insertions, 784 deletions
diff --git a/npc/re/guild/invest_main.txt b/npc/re/guild/invest_main.txt index 50a4e7d35..6661de45f 100644 --- a/npc/re/guild/invest_main.txt +++ b/npc/re/guild/invest_main.txt @@ -561,8 +561,8 @@ prt_gld,164,98,3 script Revoting Manager#Invest2 4_M_BOSSCAT,{ disablenpc "Revoting Manager#Invest2"; end; } - set .@playtime, checkquest(7349,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7349,PLAYTIME); + if (.@playtime == 1) { mes "[Revoting Manager]"; mes "You've already participated in the vote."; mes "Please relax and wait for the results."; diff --git a/npc/re/instances/BakonawaLake.txt b/npc/re/instances/BakonawaLake.txt index 89ce64ac4..584044b13 100644 --- a/npc/re/instances/BakonawaLake.txt +++ b/npc/re/instances/BakonawaLake.txt @@ -39,16 +39,16 @@ ma_scene01,174,179,4 script Taho 4_M_DEWZATIMAN,{ set .@party_id,getcharid(1); set .@md_name$, "Bakonawa Lake"; - set .@baku_time, checkquest(12278,PLAYTIME); - if (.@baku_time == -1) { - if (checkquest(12279) == -1) setquest 12279; + .@baku_time = questprogress(12278,PLAYTIME); + if (!.@baku_time) { + if (!questprogress(12279)) setquest 12279; } if (!.@party_id) { mes "[Taho]"; mes "Isn't there any company who can go with you? Or even if you wanna go alone, come after organizing a party."; close; } - if (.@baku_time == -1) { + if (!.@baku_time) { if (getcharid(0) == getpartyleader(.@party_id,2)) { mes "[Taho]"; mes "Are you the leader of the Bakonawa slayers? The road is not well so we have to go down the cliff with a rope, is that OK?"; @@ -92,7 +92,7 @@ ma_scene01,174,179,4 script Taho 4_M_DEWZATIMAN,{ case 3: close; } - } else if (.@baku_time == 0 || .@baku_time == 1) { + } else if (.@baku_time == 1) { mes "[Taho]"; mes "The rope used for getting to the Lake is already broken. We are now cleaning up the surroundings so come back after some time."; close; @@ -469,7 +469,7 @@ OnMobSpawn: mes "It seems you are already carrying items of too much weight. Please try again after reducing the weight."; close; } - if (checkquest(12279,HUNTING) == 2) { + if (questprogress(12279,HUNTING) == 2) { erasequest 12279; mes "[Taho]"; mes "This was found from Bakonawa's corpse. It would be better if you take this."; diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt index b995092a1..d4ac3f9b0 100644 --- a/npc/re/instances/BangungotHospital.txt +++ b/npc/re/instances/BangungotHospital.txt @@ -23,9 +23,9 @@ ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{ set .@party_id,getcharid(1); cutin "malaya_nurseB",2; - if (checkquest(9223) == -1) { - set .@quest, checkquest(9222); - if (.@quest == -1) { + if (!questprogress(9223)) { + .@quest = questprogress(9222); + if (!.@quest) { if (!.@party_id) { if (malaya_bang == 30) callsub L_Closed,1; @@ -34,9 +34,9 @@ ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{ else goto L_NoParty; } - if (checkquest(11309,HUNTING) < 2) { - set .@playtime, checkquest(9224,PLAYTIME); - if (.@playtime == -1) { + if (questprogress(11309,HUNTING) != 2) { + .@playtime = questprogress(9224,PLAYTIME); + if (!.@playtime) { if (malaya_bang == 30) callsub L_Closed,1; else if (malaya_bang == 31) @@ -50,8 +50,8 @@ ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{ cutin "",255; end; } - } else if (.@playtime == 0 || .@playtime == 1) { - if (checkquest(11309) == -1) { + } else if (.@playtime == 1) { + if (!questprogress(11309)) { mes "[Nurse Maenne]"; mes "This is a fatal situation."; close2; @@ -73,10 +73,10 @@ ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{ end; } } else { - set .@quest2, checkquest(11309); - if (.@quest2 == -1) { + .@quest2 = questprogress(11309); + if (!.@quest2) { callsub L_Closed,0; - } else if (.@quest2 == 0 || .@quest2 == 1) { + } else if (.@quest2 == 1) { callsub L_Complete; completequest 9224; erasequest 9224; @@ -105,13 +105,12 @@ ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{ cutin "",255; end; } - } else if (.@quest == 0 || .@quest == 1) { + } else if (.@quest == 1) { if (!.@party_id) goto L_NoParty; if (malaya_bang > 39) { - set .@hunting, checkquest(9222,HUNTING); - if (.@hunting == 0 || .@hunting == 1) { - set .@playtime, checkquest(9224,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + if (questprogress(9222,HUNTING) == 1) { + .@playtime = questprogress(9224,PLAYTIME); + if (.@playtime == 1) { mes "[Nurse Maenne]"; mes "Do you want go up to the second floor again?"; next; @@ -190,7 +189,7 @@ ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{ end; } } else { - if (checkquest(9223,PLAYTIME) == 0 || checkquest(9223,PLAYTIME) == 1) { + if (questprogress(9223,PLAYTIME) == 1) { callsub L_Complete; close2; cutin "",255; @@ -297,13 +296,13 @@ L_Enter: } else { mapannounce "ma_dun01", getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member entered "+.@md_name$+".",bc_map,"0x00ff99"; if (getarg(1)) { - if (checkquest(9223) > -1) { + if (questprogress(9223)) { completequest 9223; erasequest 9223; } - if (checkquest(9222) > -1) + if (questprogress(9222)) erasequest 9222; - if (checkquest(9224) > -1) + if (questprogress(9224)) erasequest 9224; setquest 9222; } diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt index 0a26dab9c..a24a0ae27 100644 --- a/npc/re/instances/BuwayaCave.txt +++ b/npc/re/instances/BuwayaCave.txt @@ -60,10 +60,10 @@ ma_fild02,312,317,5 script Guard#buwaya_cave 4_MAL_SOLDIER,{ next; break; case 2: - set .@playtime, checkquest(4229,PLAYTIME); - if (.@playtime == -1) { + .@playtime = questprogress(4229,PLAYTIME); + if (!.@playtime) { // fall through - } else if (.@playtime == 0 || .@playtime == 1) { + } else if (.@playtime == 1) { mes "[Guard]"; mes "Buwaya is still hiding."; mes "Even if you enter now, Buwaya will not come out. "; @@ -118,10 +118,10 @@ OnTouch: mes "This place is dangerous. Please go back."; close; } - set .@playtime, checkquest(4229,PLAYTIME); - if (.@playtime == -1) { + .@playtime = questprogress(4229,PLAYTIME); + if (!.@playtime) { // fall through - } else if (.@playtime == 0 || .@playtime == 1) { + } else if (.@playtime == 1) { mes "[Guard]"; mes "Buwaya is still hiding."; mes "Even if you enter now, Buwaya will not come out."; diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt index 0c32c73c6..0467f612b 100644 --- a/npc/re/instances/HazyForest.txt +++ b/npc/re/instances/HazyForest.txt @@ -32,9 +32,9 @@ bif_fild01,158,340,5 script Laphine Soldier#mist 4_M_FAIRYSOLDIER,{ mes "Why don't you at least organize a party?"; close; } - set .@playtime, checkquest(7211,PLAYTIME); + .@playtime = questprogress(7211,PLAYTIME); if (getcharid(0) == getpartyleader(.@party_id,2)) { - if (.@playtime == 0 || .@playtime == 1) { + if (.@playtime == 1) { mes "[Laphine Soldier]"; mes "...Are you sure you're not doing too much?"; mes "I think you'd better get some rest."; @@ -89,7 +89,7 @@ bif_fild01,158,340,5 script Laphine Soldier#mist 4_M_FAIRYSOLDIER,{ mes "Hmm..."; next; mes "[Laphine Soldier]"; - if (.@playtime == -1) + if (!.@playtime) mes "It's dangerous in the forest."; else mes "The atmosphere is somewhat tense in the forest."; @@ -117,7 +117,7 @@ bif_fild01,158,340,5 script Laphine Soldier#mist 4_M_FAIRYSOLDIER,{ case 2: mes "[Laphine Soldier]"; mes "Well, you've made the right decision."; - if (.@playtime == -1) + if (!.@playtime) mes "That's what's good for you."; close; } @@ -147,9 +147,8 @@ bif_fild01,161,355,0 script Log Tunnel CLEAR_NPC,{ next; if(select("Enter the tunnel.:Give up.") == 2) close; - set .@playtime, checkquest(7211,PLAYTIME); if (has_instance("1@mist") == "") { - if (.@playtime == 0 || .@playtime == 1) { + if (questprogress(7211,PLAYTIME) == 1) { mes "You try to crawl into the log, but some mysterious power pushes you back with a gush of wind."; mes "It seems like you can't force your way into the forest."; close; @@ -158,8 +157,8 @@ bif_fild01,161,355,0 script Log Tunnel CLEAR_NPC,{ mes "Your instinct is screaming that this forest is dangerous."; close; } else { - if (checkquest(7211,PLAYTIME) == 2) erasequest 7211; - if (checkquest(7211,PLAYTIME) == -1) setquest 7211; + if (questprogress(7211,PLAYTIME) == 2) erasequest 7211; + if (!questprogress(7211,PLAYTIME)) setquest 7211; mapannounce "bif_fild01",getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member is entering the Mistwood Maze.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0 warp "1@mist",89,29; close; @@ -1025,7 +1024,7 @@ bif_fild01,38,374,0 script Mysterious Flower#ep14_1 CLEAR_NPC,{ 1@mist,109,70,0 script a1_a2 WARPNPC,1,1,{ end; OnTouch: - if (checkquest(7211,PLAYTIME) == -1) + if (!questprogress(7211,PLAYTIME)) setquest 7211; warp instance_mapname("1@mist"),116,40; end; diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt index f209f409b..ef2af8512 100644 --- a/npc/re/instances/MalangdoCulvert.txt +++ b/npc/re/instances/MalangdoCulvert.txt @@ -44,7 +44,7 @@ mal_in01,172,28,2 script Albo#mal 4_CAT_SAILOR5,{ "General Culvert Weekly Service","^990000Hard Culvert Weekly Service^000000"; set .@menu$,"Why are doing this job?:"; for(set .@i,0; .@i<4; set .@i,.@i+1) { - if (checkquest(.@quests[.@i],PLAYTIME) > -1) { + if (questprogress(.@quests[.@i],PLAYTIME)) { set .@status[.@i],2; set .@menu$, .@menu$+"^aaaaaa- There is no new task -^000000:"; } else if (.@i%2 && BaseLevel < 140) { @@ -192,7 +192,7 @@ mal_in01,172,26,2 script Madeca#mal 4_CAT_SAILOR1,{ specialeffect2 EF_STEAL; switch(.@i) { case 1: // General Culvert Daily Service - if (checkquest(12271,PLAYTIME) == 2) + if (questprogress(12271,PLAYTIME) == 2) callsub L_EraseQuest,12255,12256,12257,12258,12259,12260,12271; else { // Reward: 2x B Grade Coin @@ -205,7 +205,7 @@ mal_in01,172,26,2 script Madeca#mal 4_CAT_SAILOR1,{ } break; case 2: // Hard Culvert Daily Service - if (checkquest(12272,PLAYTIME) == 2) + if (questprogress(12272,PLAYTIME) == 2) callsub L_EraseQuest,12261,12262,12263,12264,12265,12266,12272; else { // Reward: 1x A Grade Coin @@ -218,7 +218,7 @@ mal_in01,172,26,2 script Madeca#mal 4_CAT_SAILOR1,{ } break; case 3: // General Culvert Weekly Service - if (checkquest(12273,PLAYTIME) == 2) + if (questprogress(12273,PLAYTIME) == 2) callsub L_EraseQuest,12267,12268,12273; else { // Reward: 1x Sea God's Wrath @@ -227,7 +227,7 @@ mal_in01,172,26,2 script Madeca#mal 4_CAT_SAILOR1,{ } break; case 4: // Hard Culvert Weekly Service - if (checkquest(12274,PLAYTIME) == 2) + if (questprogress(12274,PLAYTIME) == 2) callsub L_EraseQuest,12269,12270,12274; else { // Reward: 5x Sea God's Wrath @@ -246,7 +246,7 @@ mal_in01,172,26,2 script Madeca#mal 4_CAT_SAILOR1,{ L_EraseQuest: for(set .@j,0; .@j<getargcount(); set .@j,.@j+1) { - if (checkquest(getarg(.@j)) > -1) + if (questprogress(getarg(.@j))) erasequest getarg(.@j); } mes "[Madeca]"; @@ -255,7 +255,7 @@ L_EraseQuest: // callsub L_CheckQuest,<quest ID>,<monster>,<reward item ID>,<reward item amount>; L_CheckQuest: - if (checkquest(getarg(0),HUNTING) == 2) { + if (questprogress(getarg(0),HUNTING) == 2) { mes "[Madeca]"; mes "You've punished ^0000ff"+getarg(1)+"^000000!"; mes "Here's your pay!"; @@ -392,8 +392,8 @@ mal_in01,160,34,4 script Missing, the Cleaner 4_CAT_SAILOR2,{ mes "of the party and come back.^000000"; close; } - set .@playtime, checkquest(12254,PLAYTIME); - if (.@playtime == -1) { + .@playtime = questprogress(12254,PLAYTIME); + if (!.@playtime) { if (getcharid(0) == getpartyleader(.@party_id,2)) { mes "[Missing, the Cleaner]"; mes "Ummm? What's up? Tell me the password if you're the leader!"; @@ -430,7 +430,7 @@ mal_in01,160,34,4 script Missing, the Cleaner 4_CAT_SAILOR2,{ if(select("Enter Culvert:Cancel") == 2) end; callsub L_Enter,1; - } else if (.@playtime == 0 || .@playtime == 1) { + } else if (.@playtime == 1) { mes "You can enter the Culvert if the gate is open."; next; if(select("Enter Culvert:Cancel") == 2) @@ -444,7 +444,7 @@ mal_in01,160,34,4 script Missing, the Cleaner 4_CAT_SAILOR2,{ end; L_Enter: if (has_instance("1@pump") == "") { - if (checkquest(12254,PLAYTIME) == 0 || checkquest(12254,PLAYTIME) == 1) { + if (questprogress(12254,PLAYTIME) == 1) { mes "The gate to the Culvert is still closed."; mes "You must wait until you are able to enter or find a party leader who can create the instance."; close; @@ -454,7 +454,7 @@ L_Enter: close; } mapannounce "mal_in01", strcharinfo(0)+" of the party "+getpartyname(.@party_id)+" is entering the Culvert.",bc_map,"0x00ff99"; - if (checkquest(12254) == -1) setquest 12254; + if (!questprogress(12254)) setquest 12254; warp "1@pump",63,98; end; } diff --git a/npc/re/instances/OctopusCave.txt b/npc/re/instances/OctopusCave.txt index 43c2ac66f..cbf45e5f1 100644 --- a/npc/re/instances/OctopusCave.txt +++ b/npc/re/instances/OctopusCave.txt @@ -76,8 +76,8 @@ mal_dun01,151,235,5 script Starfish 4_ASTER,{ next; break; case 2: - set .@playtime, checkquest(4197,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(4197,PLAYTIME); + if (.@playtime == 1) { mes "[Starfish]"; mes "Octopus is not around now, hehe."; mes "Please come back later."; @@ -130,7 +130,7 @@ mal_dun01,153,237,5 script Weird Entrance CLEAR_NPC,{ case 1: if (countitem(6442)) { if (has_instance("1@cash") == "") { - if (checkquest(4197,PLAYTIME) == 0 || checkquest(4197,PLAYTIME) == 1) { + if (questprogress(4197,PLAYTIME) == 1) { mes "[Starfish]"; mes "Ah, now is not the time..."; mes "Would you come back later? Hehe."; @@ -143,7 +143,7 @@ mal_dun01,153,237,5 script Weird Entrance CLEAR_NPC,{ close; } mapannounce "mal_dun01", getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member started to hunt the Octopus!",bc_map,"0x00ff99"; - if (checkquest(4197) == -1) setquest 4197; + if (!questprogress(4197)) setquest 4197; warp "1@cash",199,99; end; } diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt index 4be3133bc..48f2d6493 100644 --- a/npc/re/instances/OldGlastHeim.txt +++ b/npc/re/instances/OldGlastHeim.txt @@ -20,8 +20,8 @@ glast_01,204,273,6 script Hugin#ghinstance 4_M_SAGE_C,{ mes "[Hugin]"; mes "Huh? You feel like you have seen me in different places? I see. What can I say?"; next; - set .@ghins_time, checkquest(12317,PLAYTIME); - if (.@ghins_time == -1) { + .@ghins_time = questprogress(12317,PLAYTIME); + if (!.@ghins_time) { set .@party_id,getcharid(1); set .@p_name$,getpartyname(.@party_id); @@ -72,7 +72,7 @@ glast_01,204,273,6 script Hugin#ghinstance 4_M_SAGE_C,{ case 3: close; } - } else if (.@ghins_time == 0 || .@ghins_time == 1) { + } else if (.@ghins_time == 1) { mes "[Hugin]"; mes "Oh, geez."; mes "Your body is still under the effects of time travel. In this state, you will not be able to travel again."; @@ -83,8 +83,8 @@ glast_01,204,273,6 script Hugin#ghinstance 4_M_SAGE_C,{ } else { mes "^0000ffOld Glast Heim access trail has been cleared. It is now possible to talk to Hugin.^000000"; erasequest 12317; - if (checkquest(12318) > -1) erasequest 12318; - if (checkquest(12319) > -1) erasequest 12319; + if (questprogress(12318)) erasequest 12318; + if (questprogress(12319)) erasequest 12319; close; } } @@ -1259,8 +1259,8 @@ OnTalk6: } 1@gl_k,156,259,3 script Varmunt#ghinstance3 4_M_BARMUND,{ - if (checkquest(12318,HUNTING) == 2) { - if (checkquest(12319,HUNTING) == -1) { + if (questprogress(12318,HUNTING) == 2) { + if (!questprogress(12319,HUNTING)) { mes "[Varmunt]"; mes "There's something unusual about this thing's aura. Maybe someday we will be able to understand what is behind all of this."; cutin "gl_barmund1",2; @@ -1998,7 +1998,7 @@ OnTimer80000: } 2@gl_k,158,241,1 script Hugin#ghinstance1 4_M_SAGE_C,{ - if (checkquest(12319,HUNTING) == 2) { + if (questprogress(12319,HUNTING) == 2) { mes "[Hugin]"; mes "Well, you are pretty ridiculous. Beginners shouldn't get the loot Amdarias drops."; erasequest 12318; diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt index dc625dca1..dcf726ed3 100644 --- a/npc/re/instances/WolfchevLaboratory.txt +++ b/npc/re/instances/WolfchevLaboratory.txt @@ -1690,10 +1690,9 @@ lhz_dun04,151,276,3 script Researcher#memo 4_LGTSCIENCE,{ mes "^FF0000You cannot continue the process due to possessing too many belongings.^000000"; close; } - .@quest_time = checkquest(5112, PLAYTIME); .@killed_bosses = true; for(.@quest_id = 5113; .@quest_id <= 5125; .@quest_id++) { - if(checkquest(.@quest_id, HUNTING) <= 1) + if(questprogress(.@quest_id, HUNTING) != 2) .@killed_bosses = false; } if (lght_duk01 < 6) { @@ -1780,14 +1779,15 @@ lhz_dun04,151,276,3 script Researcher#memo 4_LGTSCIENCE,{ mes "And just so you know, please do not touch random things out of curiosity. I don't want you to get hurt."; close; case 2: - if (.@quest_time == 0) { + .@quest_time = questprogress(5112, PLAYTIME); + if (!.@quest_time) { mes "[Wolfchev]"; mes "I'm sorry, but it seems you still cannot enter to the laboratory yet. Will you come back later? The system is kind of tricky you know."; close; } else { //if (.@quest_time == 2) //recall_completequest 5112; - if (.@quest_time >= 0) + if (.@quest_time) erasequest 5112; if (!.@killed_bosses) { if (lght_duk01 == 9) { @@ -1908,13 +1908,13 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ mes "^FF0000You cannot continue the process due to possessing too many belongings.^000000"; close; } - .@lhz_time = checkquest(5112, PLAYTIME); + .@lhz_time = questprogress(5112, PLAYTIME); if (lght_duk01 < 7) { mes "It says,"; mes "'^0000FF****'s laboratory member only^000000'"; close; } - if (.@lhz_time == -1) { + if (!.@lhz_time) { mes "This is an entrance towards Wolfchev's laboratory. Something is howling over the entrance."; next; if(select("Go inside", "Think one more time") == 2) { @@ -1938,7 +1938,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ warp "1@lhz.gat", 45, 148; close; } - } else if (.@lhz_time == 0) { + } else if (.@lhz_time == 1) { mes "Di Rit- Di- Di- Dit-"; next; mes ""+ strcharinfo(PC_NAME) +". . ."; @@ -1946,7 +1946,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ next; mes "The system denied your entrance."; close; - } else if (.@lhz_time >= 1) { + } else if (.@lhz_time == 2) { mes "Di Rit- Di- Di- Dit-"; next; //if (.@lhz_time == 2) @@ -3113,7 +3113,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ } .@all_quests_complete = true; for(.@i = 5113; .@i <= 5125; .@i++) { - if(checkquest(.@i, HUNTING) != 2) + if(questprogress(.@i, HUNTING) != 2) .@all_quests_complete = false; } if (.@all_quests_complete) { diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index 7bafa8562..63d1b6106 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -156,13 +156,13 @@ function script func_3rdgc { mes .@n$; mes "Let me collect all the information..."; set .@i,0; - if (checkquest(7112) == 1) { mes "Madelle saw a person who looked like a priest from Rachel late at night."; set .@i,.@i+1; } - if (checkquest(7113) == 1) { mes "Crave said that there was a girl who bought lots of things day and night."; set .@i,.@i+1; } - if (checkquest(7114) == 1) { mes "Trovan said that there was a guy who could be seen often but is not a hotel guest, so he is suspicious."; set .@i,.@i+1; } + if (questprogress(7112) == 1) { mes "Madelle saw a person who looked like a priest from Rachel late at night."; set .@i,.@i+1; } + if (questprogress(7113) == 1) { mes "Crave said that there was a girl who bought lots of things day and night."; set .@i,.@i+1; } + if (questprogress(7114) == 1) { mes "Trovan said that there was a guy who could be seen often but is not a hotel guest, so he is suspicious."; set .@i,.@i+1; } if (!getarg(0)) { set .@i,.@i-2; - if (checkquest(7115) == 1) { mes "A peddler wears shabby clothes, but she buys fresh and expensive things every single day."; set .@i,.@i+1; } - if (checkquest(7116) == 1) { mes "The old man in village said that there was a girl who showed up in same place at the same time, so maybe moved here."; set .@i,.@i+1; } + if (questprogress(7115) == 1) { mes "A peddler wears shabby clothes, but she buys fresh and expensive things every single day."; set .@i,.@i+1; } + if (questprogress(7116) == 1) { mes "The old man in village said that there was a girl who showed up in same place at the same time, so maybe moved here."; set .@i,.@i+1; } } next; if (.@i == 3) { @@ -398,7 +398,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ set job_3rd_gc, 6; close; } else if (job_3rd_gc == 6) { - if (checkquest(7091) == 1) { + if (questprogress(7091) == 1) { mes "You hope that there will be something in the glass?"; mes "Information can't come out of empty glasses."; close; @@ -453,7 +453,8 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ next; switch(select("Figure out based on information.:Stop the stage.")) { case 1: - if (checkquest(7091) == 1) set .@j,1; + if (questprogress(7091) == 1) + .@j = 1; callfunc "func_3rdgc",.@j; close; case 2: @@ -461,7 +462,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ close; } } else if (job_3rd_gc == 8) { - if (checkquest(7092) == 1) { + if (questprogress(7092) == 1) { mes "Wait in an alley where she usually shows up to find her, and you will be able to pursue the question."; next; mes "[Daora]"; @@ -531,7 +532,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ close; } } else if (job_3rd_gc == 9) { - if (checkquest(7093) == 1) { + if (questprogress(7093) == 1) { mes "So, go to the east of village, you can see a narrow alley directed to the north."; next; mes "[Daora]"; @@ -575,7 +576,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ mes "I sent a girl named Estillda to her home."; mes "Why do we handle worthless things like it?"; next; - if (checkquest(7094) == 1) { + if (questprogress(7094) == 1) { mes "[Daora]"; mes "I'm not sure if he still lives..."; mes "Anyway, he is a key artisan in Rachel,"; @@ -639,7 +640,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ close; } } else if (job_3rd_gc == 15) { - if (checkquest(7095) == 1) { + if (questprogress(7095) == 1) { mes "The field northwest of Veins."; mes "You can find that easily with a map."; mes "There are lots of wolves, so be careful."; @@ -957,9 +958,11 @@ job3_guil01,16,20,4 script Mayshell#3rdgc03 4_F_KHELLISIA,{ mes "At least you came back alive."; } next; - set .@all_wine,0; - for(set .@i,0; .@i<5; set .@i,.@i+1) - if (checkquest(7091+.@i) == 1) set .@all_wine, .@all_wine+1; + .@all_wine = 0; + for(.@i = 0; .@i < 5; ++.@i) + if (questprogress(7091+.@i) == 1) { + ++.@all_wine; + } mes "[Mayshell]"; if (.@all_wine < 2) { mes "You did the job by yourself"; @@ -1037,13 +1040,13 @@ job3_guil01,16,20,4 script Mayshell#3rdgc03 4_F_KHELLISIA,{ erasequest 7091; erasequest 7092; erasequest 7093; - if (checkquest(7094) > -1) erasequest 7094; - if (checkquest(7095) > -1) erasequest 7095; + if (questprogress(7094)) erasequest 7094; + if (questprogress(7095)) erasequest 7095; erasequest 7112; erasequest 7113; erasequest 7114; - if (checkquest(7115) > -1) erasequest 7115; - if (checkquest(7116) > -1) erasequest 7116; + if (questprogress(7115)) erasequest 7115; + if (questprogress(7116)) erasequest 7116; changequest 7111,.@quest; next; mes "[Mayshell]"; @@ -1104,8 +1107,8 @@ ve_in,228,108,3 script Waitress#3rdgc04 1_F_PUBGIRL,{ mes "Visit and take a rest~"; close; } else if (job_3rd_gc == 6) { - if (checkquest(7091) == 1) { - if (checkquest(7112) == 1) { + if (questprogress(7091) == 1) { + if (questprogress(7112) == 1) { mes "That's all the information that I know."; mes "After that, I can't remember anything else."; next; @@ -1194,7 +1197,7 @@ ve_in,228,108,3 script Waitress#3rdgc04 1_F_PUBGIRL,{ } } } else { - if (checkquest(7112) == 1) { + if (questprogress(7112) == 1) { mes "That's all the information that I know."; mes "I haven't seen them since."; next; @@ -1338,8 +1341,8 @@ ve_in,246,303,3 script Young Merchant#3rdgc05 4_M_RACHMAN2,{ close; } else if (job_3rd_gc == 6) { - if (checkquest(7091) == 1) { - if (checkquest(7113) == 1) { + if (questprogress(7091) == 1) { + if (questprogress(7113) == 1) { mes "[Crave]"; mes "I already gave you all the information I have."; mes "I'm quick in visual learning."; @@ -1413,7 +1416,7 @@ ve_in,246,303,3 script Young Merchant#3rdgc05 4_M_RACHMAN2,{ } } } else { - if (checkquest(7113) == 1) { + if (questprogress(7113) == 1) { mes "[Crave]"; mes "I already gave you all the information I have."; mes "I'm quick in visual learning."; @@ -1534,8 +1537,8 @@ veins,291,215,3 script Vigilante#3rdgc06 4_DST_SOLDIER,{ close; } else if (job_3rd_gc == 6) { - if (checkquest(7091) == 1) { - if (checkquest(7114) == 1) { + if (questprogress(7091) == 1) { + if (questprogress(7114) == 1) { mes "[Trovan]"; mes "I already gave you all the information I have."; mes "He's the only suspicious person that's been seen."; @@ -1616,7 +1619,7 @@ veins,291,215,3 script Vigilante#3rdgc06 4_DST_SOLDIER,{ } } } else { - if (checkquest(7114) == 1) { + if (questprogress(7114) == 1) { mes "[Trovan]"; mes "I already gave you all the information I have."; mes "He's the only suspicious person that's been seen."; @@ -1698,12 +1701,12 @@ veins,187,143,5 script Peddler#3rdgc07 4_F_HUGRANMA,{ close; } else if (job_3rd_gc == 6) { - if (checkquest(7091) == 1) { + if (questprogress(7091) == 1) { mes "What a huge sandstorm."; mes "Are you ok?"; close; } else { - if (checkquest(7115) == 1) { + if (questprogress(7115) == 1) { mes "So, did you find that girl?"; mes "If you do, let her know that she has to come and visit me."; next; @@ -1799,11 +1802,11 @@ veins,235,126,3 script Old Man#3rdgc07 4_M_DST_GRAND,{ mes "Haha... I can remember my past when I see a young adventurer like you..."; close2; } else if (job_3rd_gc == 6) { - if (checkquest(7091) == 1) { + if (questprogress(7091) == 1) { mes "Haha... I can remember my past when I see a young adventurer like you..."; close; } else { - if (checkquest(7116) == 1) { + if (questprogress(7116) == 1) { mes "Thanks for talking to me."; next; mes "- I can't get anymore information from the Old Man. What information have I collected? -"; @@ -2075,12 +2078,12 @@ veins,337,284,0 script #ghostestilla_3rdgc HIDDEN_WARP_NPC,3,3,{ end; OnTouch: if (job_3rd_gc == 9) { - if ((checkquest(7104,PLAYTIME) == 1) || (checkquest(7105,PLAYTIME) == 1)) { + if ((questprogress(7104,PLAYTIME) == 1) || (questprogress(7105,PLAYTIME) == 1)) { mes ".....?"; mes "There's a sign of somebody present."; mes "You still have time."; close; - } else if ((checkquest(7104,PLAYTIME) == 2) || (checkquest(7105,PLAYTIME) == 2)) { + } else if ((questprogress(7104,PLAYTIME) == 2) || (questprogress(7105,PLAYTIME) == 2)) { mes "The blind alley that Melissa told me about must be this street."; next; mes "There's a sign of somebody present."; @@ -2158,8 +2161,8 @@ OnTouch: next; mes "- I demand that she walks as usual and tell her how to get to Daora's pub. -"; donpcevent "Estillda#3rdgc10::OnDisable"; - if (checkquest(7104) > -1) erasequest 7104; - if (checkquest(7105) > -1) erasequest 7105; + if (questprogress(7104)) erasequest 7104; + if (questprogress(7105)) erasequest 7105; set job_3rd_gc, 10; setquest 7106; next; @@ -2168,8 +2171,8 @@ OnTouch: } else { mes "- I tried to take her by the wrist, but she already knew and ran away screaming. -"; donpcevent "Estillda#3rdgc10::OnDisable"; - if (checkquest(7104) > -1) erasequest 7104; - if (checkquest(7105) > -1) erasequest 7105; + if (questprogress(7104)) erasequest 7104; + if (questprogress(7105)) erasequest 7105; setquest 7105; next; mes "You couldn't catch Estillda."; @@ -2320,7 +2323,7 @@ OnInit: end; OnTouch: if (job_3rd_gc == 12) { - if (checkquest(7107,PLAYTIME) == 2) { + if (questprogress(7107,PLAYTIME) == 2) { mes "This must be the place Estillda told me about."; next; switch(select("Go inside.:Observe the situation.")) { @@ -2339,7 +2342,7 @@ OnTouch: mes "I back up to watch the situation unfold."; close; } - } else if (checkquest(7107,PLAYTIME) == 1) { + } else if (questprogress(7107,PLAYTIME) == 1) { mes "This must be the place Estillda told me about."; mes "I have enough time for meeting."; close; @@ -3540,12 +3543,12 @@ OnTimer61500: job3_guil03,146,70,3 script Renzak#3rdgc16 4_F_GUILLOTINE,{ mes "[Renzak]"; - if (checkquest(7110,HUNTING) == 2) { + if (questprogress(7110,HUNTING) == 2) { mes "My peers will come here to settle this affair."; mes "Go to Mayshell for the report."; next; mes "[Renzak]"; - if (checkquest(7110,PLAYTIME) == 1) { + if (questprogress(7110,PLAYTIME) == 1) { mes "You finished quickly."; mes "Good job."; set job_3rd_gc, 18; @@ -3653,16 +3656,16 @@ job3_guil01,148,53,3 script Bercasell#3rdgc16 4_M_GUILLOTINE,{ mes "A sword of the shadow..."; setlook 7,0; jobchange roclass(eaclass()|EAJL_THIRD); - if (checkquest(7096) == 1) { + if (questprogress(7096) == 1) { set job_3rd_gc, 25; erasequest 7096; - } else if (checkquest(7097) == 1) { + } else if (questprogress(7097) == 1) { set job_3rd_gc, 26; erasequest 7097; - } else if (checkquest(7098) == 1) { + } else if (questprogress(7098) == 1) { set job_3rd_gc, 27; erasequest 7098; - } else if (checkquest(7099) == 1) { + } else if (questprogress(7099) == 1) { set job_3rd_gc, 28; erasequest 7099; } diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt index d8a10820f..6c86be78b 100644 --- a/npc/re/jobs/3-1/ranger.txt +++ b/npc/re/jobs/3-1/ranger.txt @@ -384,7 +384,7 @@ tur_dun01,91,169,3 script Test Instructor#jr02 4_M_JOB_HUNTER,{ changequest 8256,8257; close; } else if (job_ranger01 == 4) { - if (checkquest(8257,HUNTING) == 2) { + if (questprogress(8257,HUNTING) == 2) { if (countitem(7064) > 0) { mes "Oh! Oh! Woooooow!"; mes "You've brought it! Let me see..."; @@ -549,9 +549,10 @@ tur_dun01,91,169,3 script Test Instructor#jr02 4_M_JOB_HUNTER,{ mes "Okay. I'll respect your opinion."; mes "I'll cancel the job change request from "+strcharinfo(0)+"."; delitem 1703,1; //Bow__ - set job_ranger01,0; - for(set .@i,8254; .@i<=8262; set .@i,.@i+1) - if (checkquest(.@i) > -1) erasequest .@i; + job_ranger01 = 0; + for(.@i = 8254; .@i <= 8262; ++.@i) + if (questprogress(.@i)) + erasequest .@i; close; } mes "[Test Instructor, Teardrop]"; @@ -710,9 +711,10 @@ job3_rang01,30,44,3 script Test Waiting Room#jr_03 4_M_ORIENT01,{ mes "Okay. I'll respect your opinion."; mes "I'll cancel the job change request from "+strcharinfo(0)+"."; delitem 1703,1; //Bow__ - set job_ranger01,0; - for(set .@i,8254; .@i<=8262; set .@i,.@i+1) - if (checkquest(.@i) > -1) erasequest .@i; + job_ranger01 = 0; + for(.@i = 8254; .@i <= 8262; ++.@i) + if (questprogress(.@i)) + erasequest .@i; close; close2; warp "alberta",117,57; @@ -1450,7 +1452,7 @@ OnTimer130000: job3_rang02,251,49,3 script Test Supervisor#jr_13 4_M_JOB_HUNTER,{ mes "[Test Supervisor, Freeze]"; if (job_ranger01 == 6) { - if (checkquest(8261) == -1) { + if (!questprogress(8261)) { mes "Congrats for passing the 2nd practical test! I am the 3rd practical test supervisor Freeze!"; next; mes "[Test Supervisor, Freeze]"; @@ -1705,9 +1707,10 @@ job3_rang01,90,43,3 script Ranger Master#jr_29 4_M_REIDIN_KURS,{ mes "[Ranger Master, Neveragain]"; mes "What are you doing here?"; mes "You are not supposed to be here. Get out!"; - set job_ranger01,0; - for(set .@i,8254; .@i<=8262; set .@i,.@i+1) - if (checkquest(.@i) > -1) erasequest .@i; + job_ranger01 = 0; + for(.@i = 8254; .@i <= 8262; ++.@i) + if (questprogress(.@i)) + erasequest .@i; close2; warp "alberta",117,57; end; diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt index ad8e4b8da..7c38c7c25 100644 --- a/npc/re/jobs/3-1/rune_knight.txt +++ b/npc/re/jobs/3-1/rune_knight.txt @@ -622,7 +622,7 @@ job3_rune01,90,50,3 script Rune Knight Lunarea 4_M_KNIGHT_GOLD,2,2,{ next; switch(select("Move to the test field now.:Please give me time to prepare.")) { case 1: - if (checkquest(3220,PLAYTIME) == 1) { + if (questprogress(3220,PLAYTIME) == 1) { mes "[Rune Knight, Lunarea]"; mes "Once someone enters into the test field you cannot enter directly. The test is taken one by one."; next; @@ -664,7 +664,7 @@ L_Test: set job_rune_edq,4; changequest 3202,3203; setquest 3220; // ? - } else if (checkquest(3220) > -1) { + } else if (questprogress(3220)) { erasequest 3220; setquest 3220; } @@ -1346,7 +1346,7 @@ mid_camp,235,250,3 script Sage Serpeone 4_F_FAIRY,2,2,{ mes "[Sage Serpeone]"; mes "Is it so? Then let's check this out."; next; - if (checkquest(3209,HUNTING) == 2 && checkquest(3210,HUNTING) == 2 && checkquest(3211,HUNTING) == 2 && checkquest(3212,HUNTING) == 2) { + if (questprogress(3209,HUNTING) == 2 && questprogress(3210,HUNTING) == 2 && questprogress(3211,HUNTING) == 2 && questprogress(3212,HUNTING) == 2) { mes "[Sage Serpeone]"; mes "Umm, this is great. Enough amount of living body magical energy has accumulated in your body."; next; @@ -1481,7 +1481,7 @@ job3_rune01,114,50,3 script Rune Knight Velpino 4_M_KNIGHT_BLACK,{ mes "For this test, only a one-hand weapon, a shield or a two-handed weapon can be equipped. Keep your other equipments with the Kafra Employee in the center."; close; } - if (checkquest(3220,PLAYTIME) == 1) { + if (questprogress(3220,PLAYTIME) == 1) { mes "[Rune Knight Velpino]"; mes "Haven't you failed at the test... If you fail once, you cannot enter again for 10 minutes."; next; @@ -1495,7 +1495,7 @@ job3_rune01,114,50,3 script Rune Knight Velpino 4_M_KNIGHT_BLACK,{ sc_start SC_INCINT,300000,40; getitem 12389,30; //Runstone_Storm getitem 12390,30; //Runstone_Millennium - if (checkquest(3220) > -1) erasequest 3220; + if (questprogress(3220)) erasequest 3220; setquest 3220; warp "job3_rune02",38,40; end; diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt index e264bfdca..caf2f428d 100644 --- a/npc/re/jobs/3-2/genetic.txt +++ b/npc/re/jobs/3-2/genetic.txt @@ -390,12 +390,12 @@ job3_gen01,25,58,3 script Devries#gen 4_LGTSCIENCE,{ mes "You can start from the beginning then?"; mes "Why are you asking me such things?"; set job_gen,7; - if (checkquest(2209) == 1) erasequest 2209; - if (checkquest(2210) == 1) erasequest 2210; - if (checkquest(2211) == 1) erasequest 2211; - if (checkquest(2212) == 1) erasequest 2212; - if (checkquest(2213) == 1) erasequest 2213; - if (checkquest(2214) == 1) erasequest 2214; + if (questprogress(2209) == 1) erasequest 2209; + if (questprogress(2210) == 1) erasequest 2210; + if (questprogress(2211) == 1) erasequest 2211; + if (questprogress(2212) == 1) erasequest 2212; + if (questprogress(2213) == 1) erasequest 2213; + if (questprogress(2214) == 1) erasequest 2214; close; } } else if (job_gen == 60 || job_gen == 61) { @@ -473,15 +473,15 @@ job3_gen01,25,58,3 script Devries#gen 4_LGTSCIENCE,{ set job_gen,7; } } - if (checkquest(2209) == 1) erasequest 2209; - if (checkquest(2210) == 1) erasequest 2210; - if (checkquest(2211) == 1) erasequest 2211; - if (checkquest(2212) == 1) erasequest 2212; - if (checkquest(2213) == 1) erasequest 2213; - if (checkquest(2214) == 1) erasequest 2214; + if (questprogress(2209) == 1) erasequest 2209; + if (questprogress(2210) == 1) erasequest 2210; + if (questprogress(2211) == 1) erasequest 2211; + if (questprogress(2212) == 1) erasequest 2212; + if (questprogress(2213) == 1) erasequest 2213; + if (questprogress(2214) == 1) erasequest 2214; close; } else if (job_gen > 61 && job_gen < 76) { - if (checkquest(2223,HUNTING) == 2) { + if (questprogress(2223,HUNTING) == 2) { mes "[Devries]"; mes "Oh, wait a second."; mes "It seems that the mail's has arrived."; @@ -642,7 +642,7 @@ job3_gen01,12,56,3 script Plant Guide#generic HIDDEN_NPC,{ // QuestID,PlantName,Description{,Part?} function script Genetic_Job_Plant { if (job_gen == 7) { - if (checkquest(getarg(0)) == -1 || checkquest(getarg(0)) == 0) { + if (!questprogress(getarg(0))) { mes "- "+getarg(2)+" -"; next; switch(select("Use it as a material.:Do not use.")) { @@ -699,12 +699,8 @@ job3_gen01,7,50,3 script Testing Table#gen CLEAR_NPC,{ mes "- It's not the time to start an experiment. -"; close; } - if ((checkquest(2209) == -1 || checkquest(2209) == 0) && - (checkquest(2210) == -1 || checkquest(2210) == 0) && - (checkquest(2211) == -1 || checkquest(2211) == 0) && - (checkquest(2212) == -1 || checkquest(2212) == 0) && - (checkquest(2213) == -1 || checkquest(2213) == 0) && - (checkquest(2214) == -1 || checkquest(2214) == 0)) { + if (!questprogress(2209) && !questprogress(2210) && !questprogress(2211) && !questprogress(2212) + && !questprogress(2213) && !questprogress(2213) && !questprogress(2214)) { mes "["+strcharinfo(0)+"]"; mes "Hmm, I need to gather plant materials first."; close; @@ -731,16 +727,14 @@ job3_gen01,7,50,3 script Testing Table#gen CLEAR_NPC,{ next; mes "["+strcharinfo(0)+"]"; mes "Good. Now I can let Miss Devries take a look at this seed!"; - if ((checkquest(2209) == -1 || checkquest(2209) == 0) && - (checkquest(2210) == -1 || checkquest(2210) == 0) && - (checkquest(2211) == -1 || checkquest(2211) == 0)){ + if (!questprogress(2209) && !questprogress(2210) && !questprogress(2211)) { set job_gen,61; getitem 6272,1; //Experiment_Seed close; } - if (checkquest(2209) == 1) set job_gen,job_gen+10; - if (checkquest(2210) == 1) set job_gen,job_gen+10; - if (checkquest(2211) == 1) set job_gen,job_gen+10; + if (questprogress(2209) == 1) set job_gen,job_gen+10; + if (questprogress(2210) == 1) set job_gen,job_gen+10; + if (questprogress(2211) == 1) set job_gen,job_gen+10; set .@score, job_gen + JobLevel - 20; if (rand(1,100) < .@score) { set job_gen,60; @@ -756,12 +750,12 @@ job3_gen01,7,50,3 script Testing Table#gen CLEAR_NPC,{ set job_gen,7; if (countitem(6273)) delitem 6273,1; //Altered_Seed if (countitem(6272)) delitem 6272,1; //Experiment_Seed - if (checkquest(2209) == 1) erasequest 2209; - if (checkquest(2210) == 1) erasequest 2210; - if (checkquest(2211) == 1) erasequest 2211; - if (checkquest(2212) == 1) erasequest 2212; - if (checkquest(2213) == 1) erasequest 2213; - if (checkquest(2214) == 1) erasequest 2214; + if (questprogress(2209) == 1) erasequest 2209; + if (questprogress(2210) == 1) erasequest 2210; + if (questprogress(2211) == 1) erasequest 2211; + if (questprogress(2212) == 1) erasequest 2212; + if (questprogress(2213) == 1) erasequest 2213; + if (questprogress(2214) == 1) erasequest 2214; close; } else if (job_gen == 60 || job_gen == 61) { mes " - It looks like I need to let Miss Devries take a look at this seed! -"; @@ -920,7 +914,7 @@ job3_gen01,91,48,3 script Demi Calberine#gen 4_F_SCIENCE,{ warp "job3_gen01",23,32; end; } else if (job_gen == 75) { - if (checkquest(2223,HUNTING) == 2) { + if (questprogress(2223,HUNTING) == 2) { mes "It seem Miss Devries found out that I put you in her spore pen."; mes "It's funny when you look at her face. After you've killed all those spores."; close; @@ -1017,7 +1011,7 @@ OnTouch: job3_gen01,24,32,0 script The gaze of Devries HIDDEN_WARP_NPC,2,2,{ OnTouch: - if (checkquest(2223,HUNTING) == 2) { + if (questprogress(2223,HUNTING) == 2) { mapannounce "job3_gen01","Devries: Whoa? Was there a lost kitty in the spore pen?",bc_map,"0x99CC00"; //FW_NORMAL 12 0 0 emotion e_omg,1; warp "job3_gen01",21,38; diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt index a189d438d..be017920e 100644 --- a/npc/re/jobs/3-2/minstrel.txt +++ b/npc/re/jobs/3-2/minstrel.txt @@ -954,7 +954,7 @@ yuno,143,170,6 script Mr. Click#job_min 4_M_ALCHE_A,{ lighthalzen,155,119,3 script Little girl#job_min 4_F_HUGIRL,3,3,{ OnTouch: - if (checkquest(11145,HUNTING) == 2) { + if (questprogress(11145,HUNTING) == 2) { if (job_min == 12) { mes "[Little Girl]"; mes "Ah!!!!"; diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt index d1c6ce75f..fc95e1dc4 100644 --- a/npc/re/jobs/3-2/shadow_chaser.txt +++ b/npc/re/jobs/3-2/shadow_chaser.txt @@ -1719,12 +1719,12 @@ tur_dun03,38,209,1 script Blue Flame#sc_f01 4_NFWISP,{ mes "They seem to be related."; set job_sha,6; setquest 7164; - if (checkquest(7161) >= 0) erasequest 7161; - if (checkquest(7162) >= 0) erasequest 7162; - if (checkquest(7163) >= 0) erasequest 7163; + if (questprogress(7161)) erasequest 7161; + if (questprogress(7162)) erasequest 7162; + if (questprogress(7163)) erasequest 7163; close; } else if (job_sha == 6) { - if (checkquest(7164,HUNTING) == 2) { + if (questprogress(7164,HUNTING) == 2) { mes "It looks like the blue flame is under the limitation."; mes "You can't feel that rolling effect of a spell like before."; next; @@ -1787,7 +1787,7 @@ ice_dun02,206,223,1 script Red Flame#sc_f02 4_NFWISP,{ setquest 7171; close; } else if (job_sha == 14 || job_sha == 15 || job_sha == 16) { - if (checkquest(7171,HUNTING) == 2) { + if (questprogress(7171,HUNTING) == 2) { mes "You can't feel the soul from the flame."; mes "When you go closer, you can't see well because of darkness."; close2; @@ -1894,7 +1894,7 @@ niflheim,230,276,1 script Red Flame#sc_f03 4_NFWISP,{ setquest 7175; close; } else if (job_sha == 22) { - if (checkquest(7175,HUNTING) == 2) { + if (questprogress(7175,HUNTING) == 2) { mes "You can't feel the soul from the flame."; mes "When you go closer, you can't see well because of darkness."; set job_sha,23; diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt index ce6aa152a..787c42e7a 100644 --- a/npc/re/jobs/3-2/sura.txt +++ b/npc/re/jobs/3-2/sura.txt @@ -377,7 +377,7 @@ ve_in,98,159,0 script Fighter#job_shu 4_F_SURA,{ close; } } else if (job_shu == 3) { - if (checkquest(11156,HUNTING) == 2) { + if (questprogress(11156,HUNTING) == 2) { mes "[???]"; mes "Wow~"; mes "Did you really kill all those wolves?"; diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt index ae8cb109c..5a3319a62 100644 --- a/npc/re/jobs/3-2/wanderer.txt +++ b/npc/re/jobs/3-2/wanderer.txt @@ -770,8 +770,8 @@ hu_fild05,342,130,5 script Dancer Kim#fild 4_F_CAPEGIRL,{ changequest 2220,2221; close; } else if (job_wan == 7) { - if (checkquest(2221,PLAYTIME) == 0 || checkquest(2221,PLAYTIME) == 1) { - if (checkquest(2221,HUNTING) == 2) { + if (questprogress(2221,PLAYTIME) == 1) { + if (questprogress(2221,HUNTING) == 2) { mes "[Dancer Kim]"; mes "Whew!"; mes "Looks like I've lost!"; @@ -816,7 +816,7 @@ hu_fild05,342,130,5 script Dancer Kim#fild 4_F_CAPEGIRL,{ mes "But I'm sure I have a better chance to win."; close; } - } else if (checkquest(2221,PLAYTIME) == 2) { + } else if (questprogress(2221,PLAYTIME) == 2) { mes "[Dancer Kim]"; mes "Oh, you came back to me."; mes "I'm so tired. I don't give up halfway. It's a good exercise for me. I will have to give up Nollio to another Wanderer, it's all over...."; diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt index b7a4bd492..066f56331 100644 --- a/npc/re/jobs/novice/novice.txt +++ b/npc/re/jobs/novice/novice.txt @@ -1178,7 +1178,7 @@ new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 8W_SOLDIER close2; } else if (job_novice_q < 15) { if (job_novice_q == 13) { - if (checkquest(7122,HUNTING) == 2) { + if (questprogress(7122,HUNTING) == 2) { mes "[Brade]"; mes "You can see it is not so hard, huh?"; mes "Nice job."; @@ -1412,8 +1412,8 @@ new_5-3,96,30,4 duplicate(NvBradeB) Brade#nv5b 4_M_JOB_KNIGHT1 end; } case 3: - set .@quest, checkquest(7123); - if (.@quest == -1) { + .@quest = questprogress(7123); + if (!.@quest) { mes "[Swordman Guildsman]"; mes "You want me to give you a quest?"; mes "Umm. Let me see."; @@ -1432,8 +1432,8 @@ new_5-3,96,30,4 duplicate(NvBradeB) Brade#nv5b 4_M_JOB_KNIGHT1 mes "I'll wait for you here."; mes "Wish you a good luck."; close; - } else if (.@quest == 0 || .@quest == 1) { - if (checkquest(7123,HUNTING) == 2) { + } else if (.@quest == 1) { + if (questprogress(7123,HUNTING) == 2) { mes "[Swordman Guildsman]"; mes "Great."; mes "I think that you're good enough to be a Swordman."; @@ -1646,8 +1646,8 @@ new_5-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv5 4_F_SISTER end; } case 3: - set .@quest, checkquest(7127); - if (.@quest == -1) { + .@quest = questprogress(7127); + if (!.@quest) { mes "[Thief Guild Member]"; mes "Quests?"; mes "Hmm, what will be good for you?"; @@ -1662,8 +1662,8 @@ new_5-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv5 4_F_SISTER mes "If you equip the Thief manual, you can have the effect of the skill, Double Attack."; mes "Double Attack and Hide are the main skills of the Thief."; close; - } else if (.@quest == 0 || .@quest == 1) { - if (checkquest(7127,HUNTING) == 2) { + } else if (.@quest == 1) { + if (questprogress(7127,HUNTING) == 2) { mes "[Thief Guild Member]"; mes "You are very strong."; mes "These are not many but let me give you a reward for your effort."; @@ -1784,8 +1784,8 @@ new_5-3,105,41,3 duplicate(NvThief) Thief Guide#nv5 2_M_THIEFMASTER end; } case 3: - set .@quest, checkquest(7126); - if (.@quest == -1) { + .@quest = questprogress(7126); + if (!.@quest) { mes "[Merchant Guildsman]"; mes "Huh? Quest??"; mes "Humm... What would be suited for you...?"; @@ -1799,7 +1799,7 @@ new_5-3,105,41,3 duplicate(NvThief) Thief Guide#nv5 2_M_THIEFMASTER mes "I will wait for you here."; mes "Good luck!"; close; - } else if (.@quest == 0 || .@quest == 1) { + } else if (.@quest == 1) { if (Zeny >= 300) { mes "[Merchant Guildsman]"; mes "Excellent!"; @@ -2046,8 +2046,8 @@ new_5-3,113,41,3 duplicate(NvArcher) Archer Guide#nv5 4_F_JOB_HUNTER end; } case 3: - set .@quest, checkquest(7124); - if (.@quest == -1) { + .@quest = questprogress(7124); + if (!.@quest) { mes "[Mage Guild Member]"; mes "Huh? Quest?"; mes "Hmm... What would be suited for you...?"; @@ -2062,8 +2062,8 @@ new_5-3,113,41,3 duplicate(NvArcher) Archer Guide#nv5 4_F_JOB_HUNTER mes "I will wait for you here."; mes "Good luck!"; close; - } else if (.@quest == 0 || .@quest == 1) { - if (checkquest(7124,HUNTING) == 2) { + } else if (.@quest == 1) { + if (questprogress(7124,HUNTING) == 2) { mes "[Mage Guild Member]"; mes "You have done an excellent job."; mes "So, did you find any interests about Mages?"; @@ -2443,10 +2443,10 @@ new_5-2,161,182,5 duplicate(NvEdwin) Instructor#nv5 4_F_03 function script F_NvErase { if (getarg(0,0)) { - if (checkquest(7123) > -1) erasequest 7123; - if (checkquest(7124) > -1) erasequest 7124; - if (checkquest(7126) > -1) erasequest 7126; - if (checkquest(7127) > -1) erasequest 7127; + if (questprogress(7123)) erasequest 7123; + if (questprogress(7124)) erasequest 7124; + if (questprogress(7126)) erasequest 7126; + if (questprogress(7127)) erasequest 7127; } nude; setarray .@manuals[0],countitem(2819),countitem(2820),countitem(2821),countitem(2822),countitem(2823),countitem(2824); diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt index 044e386fe..62facbdf9 100644 --- a/npc/re/jobs/novice/supernovice_ex.txt +++ b/npc/re/jobs/novice/supernovice_ex.txt @@ -58,7 +58,7 @@ function script Esseray_Ex { } beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ - if (checkquest(5092) >= 0) { + if (questprogress(5092)) { mes "[Fishing Novice]"; mes "Sh --------- !!"; mes "Be quiet please."; @@ -165,7 +165,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ mes "- Talk to him again. -"; close; } - else if (checkquest(5093) >= 0) { + else if (questprogress(5093)) { mes "[Nodor]"; mes "Emmhmm ----- !!"; next; @@ -268,7 +268,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ mes "Don't come back until you've hunted 1,000."; close; } - else if (checkquest(5094) >= 0 || checkquest(5095) >= 0 || checkquest(5096) >= 0 || checkquest(5097) >= 0) { + else if (questprogress(5094) || questprogress(5095) || questprogress(5096) || questprogress(5097)) { mes "["+strcharinfo(0)+"]"; mes "Hey, Nodor!"; next; @@ -277,7 +277,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ mes "Oh my god!"; mes "So frightened... let me see?"; next; - if (checkquest(5094,HUNTING) != 2 && checkquest(5095,HUNTING) != 2 && checkquest(5096,HUNTING) != 2 && checkquest(5097,HUNTING) != 2) { + if (questprogress(5094,HUNTING) != 2 && questprogress(5095,HUNTING) != 2 && questprogress(5096,HUNTING) != 2 && questprogress(5097,HUNTING) != 2) { mes "[Nodor]"; mes "Hey! Super Novice!"; mes "Didn't I say to hunt 1,000?"; @@ -298,7 +298,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ mes "Don't tell a lie!! I will hit you!!"; close; } - if (checkquest(5094+.@i,HUNTING) != 2) { + if (questprogress(5094+.@i,HUNTING) != 2) { mes "[Nodor]"; mes "Don't tell a lie!"; mes "I didn't tell you to hunt this!"; @@ -321,7 +321,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ mes "I will let you know how to overcome your strength deficiencies."; close; } - else if (checkquest(5098) >= 0) { + else if (questprogress(5098)) { if (rand(10) != 1) { mes "[Nodor]"; mes "Oh! You already came here?"; @@ -377,7 +377,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ mes "You can give some to my bro. He's up in the airship."; close; } - else if (checkquest(5099) >= 0) { + else if (questprogress(5099)) { mes "[Nodor]"; mes "Have you visited already?"; next; @@ -392,7 +392,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ mes "10,000,000 zeny is okay~"; close; } - else if (checkquest(5100) >= 0) { + else if (questprogress(5100)) { if (EXSUPNOV_Q_ == 3) set .@str$,"300,000"; else if (EXSUPNOV_Q_ == 4) set .@str$,"1,000,000"; else set .@str$,"100,000"; @@ -588,7 +588,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ } airplane,33,47,5 script Nudor#sp2 4_F_NOVICE,{ - if (checkquest(5099) >= 0) { + if (questprogress(5099)) { mes "[Nudor]"; mes "Ahhh~ I have no money to buy any food."; mes "I'm hungry, but I have no idea when Brother is coming..."; @@ -670,7 +670,7 @@ airplane,33,47,5 script Nudor#sp2 4_F_NOVICE,{ mes "- tricked, so go back to Nodor. -"; close; } - else if (checkquest(5100) >= 0) { + else if (questprogress(5100)) { mes "[Nudor]"; mes "I cannot believe that my bro sent me money... I love it~"; next; diff --git a/npc/re/jobs/repair.txt b/npc/re/jobs/repair.txt index 184f7071f..58d2489e4 100644 --- a/npc/re/jobs/repair.txt +++ b/npc/re/jobs/repair.txt @@ -169,7 +169,7 @@ prt_in,38,104,4 script Valerie 4_F_VALKYRIE,{ L_Second: if (getd(getarg(0)) != 0) { setd getarg(0),0; - if (checkquest(getarg(1)) == 2) + if (questprogress(getarg(1)) == 2) erasequest getarg(1); mes "[Valerie]"; mes "I will help clear your problems for you that came from your former attempts."; @@ -184,15 +184,15 @@ L_Third: if (getd(getarg(0)) != 0) { setd getarg(0),0; if (getarg(1)) { - if (checkquest(getarg(1)) == 2) + if (questprogress(getarg(1)) == 2) erasequest getarg(1); } for(set .@i,getarg(2); .@i<=getarg(3); set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } if (getarg(4,0)) { - if (checkquest(getarg(4)) > -1) + if (questprogress(getarg(4))) erasequest getarg(4); } mes "[Valerie]"; 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<getargcount(); set .@i,.@i+1) mes getarg(.@i); - if (getarg(0) == 11123 && checkquest(11123,PLAYTIME) == 2) + if (getarg(0) == 11123 && questprogress(11123,PLAYTIME) == 2) erasequest 11133; // Special case for "Collect Poison Spores" setquest getarg(0); close; @@ -99,8 +99,8 @@ L_Quest: moc_para01,32,30,6 script Spike 4_F_CHILD,{ for(set .@i,11114; .@i<11124; set .@i,.@i+1) { - set .@j, checkquest(.@i,HUNTING); - if (.@j == 2) switch(.@i) { + .@state = questprogress(.@i,HUNTING); + if (.@state == 2) switch(.@i) { case 11114: callsub L_Quest,.@i,"Hornet Hunting",900; case 11115: callsub L_Quest,.@i,"Condor Hunting",1800; case 11116: callsub L_Quest,.@i,"Grasshopper's Leg",1400,940,10; @@ -112,7 +112,7 @@ moc_para01,32,30,6 script Spike 4_F_CHILD,{ case 11122: callsub L_Quest,.@i,"Collect Feathers",5400; case 11123: callsub L_Quest,.@i,"Collect Poison Spores",6000,7033,5; } - else if (.@j >= 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<getarraysize(.@quests); set .@i,.@i+1) { - if (checkquest(.@quests[.@i],HUNTING) == 2) + if (questprogress(.@quests[.@i],HUNTING) == 2) set .@complete[getarraysize(.@complete)], .@quests[.@i]; } - if (checkquest(5057) > -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."; diff --git a/npc/re/quests/homun_s.txt b/npc/re/quests/homun_s.txt index d5abca9fd..0c8f39b30 100644 --- a/npc/re/quests/homun_s.txt +++ b/npc/re/quests/homun_s.txt @@ -20,13 +20,13 @@ job3_gen01,12,44,3 script Viorel#job3_gen01 4_M_ALCHE_E,{ if (countitem(6415)) { if (Class == Job_Genetic || Class == Job_Genetic_T || Class == Job_Baby_Genetic) { disable_items; - if (checkquest(4159) == -1 && checkquest(4160) == -1) { + if (!questprogress(4159) && !questprogress(4160)) { mes "[Viorel]"; mes "Why are you here?"; mes "Shouldn't you be at ^005DFFJeyna^000000's house?"; close2; - for(set .@i,4154; .@i<=4160; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + for(.@i = 4154; .@i <= 4160; ++.@i) { + if (questprogress(.@i)) erasequest .@i; } setquest 4154; @@ -64,8 +64,8 @@ job3_gen01,12,44,3 script Viorel#job3_gen01 4_M_ALCHE_E,{ close; } } - if ((Class == Job_Genetic || Class == Job_Genetic_T || Class == Job_Baby_Genetic) && (checkquest(4154) > -1)) { - if ((checkquest(4155) > -1) || (checkquest(4160) > -1)) { + if ((Class == Job_Genetic || Class == Job_Genetic_T || Class == Job_Baby_Genetic) && questprogress(4154)) { + if (questprogress(4155) || questprogress(4160)) { mes "[Viorel]"; mes "Weather's great."; next; @@ -270,7 +270,7 @@ L_CheckHomunculus: } que_house_s,24,47,3 script Viorel#homun_s 4_M_ALCHE_E,{ - if (checkquest(4155) > -1) { + if (questprogress(4155)) { emotion e_dum; mes "[Viorel]"; mes "Good."; @@ -400,7 +400,7 @@ que_house_s,24,47,3 script Viorel#homun_s 4_M_ALCHE_E,{ end; } } - } else if (checkquest(4160) > -1) { + } else if (questprogress(4160)) { playbgm "33.mp3"; // Yuna Song mes "[Viorel]"; mes "The ^FF4800Homunculus^000000 I saw before has returned to its ^0000FFembryo^000000 state."; @@ -592,7 +592,7 @@ que_house_s,24,47,3 script Viorel#homun_s 4_M_ALCHE_E,{ close; } else { for(set .@i,4154; .@i<=4160; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } mes "[Viorel]"; @@ -605,7 +605,7 @@ que_house_s,24,47,3 script Viorel#homun_s 4_M_ALCHE_E,{ } que_house_s,80,42,3 script Jeyna#homun_s 4_F_ALCHE_A,{ - if (checkquest(4156) > -1) { + if (questprogress(4156)) { playbgm "28.mp3"; // You're in Ruins emotion e_gasp; mes "[Jeyna]"; @@ -661,14 +661,14 @@ que_house_s,80,42,3 script Jeyna#homun_s 4_F_ALCHE_A,{ setquest 4157; erasequest 4156; end; - } else if (checkquest(4157) > -1) { + } else if (questprogress(4157)) { emotion e_what; mes "[Jeyna]"; mes "Take a look at the board behind me, on the right."; close2; emotion e_gasp,0,"Magic Board#homun_s"; end; - } else if (checkquest(4158) > -1) { + } else if (questprogress(4158)) { playbgm "28.mp3"; // You're in Ruins disable_items; mes "[Jeyna]"; @@ -772,7 +772,7 @@ que_house_s,80,42,3 script Jeyna#homun_s 4_F_ALCHE_A,{ mes "Maybe I shouldn't have asked in the first place."; close; } - } else if (checkquest(4159) > -1 || checkquest(4160) > -1) { + } else if (questprogress(4159) || questprogress(4160)) { playbgm "28.mp3"; // You're in Ruins mes "[Jeyna]"; mes "^005DFFViorel^000000 will finish the mutation process."; @@ -790,7 +790,7 @@ que_house_s,80,42,3 script Jeyna#homun_s 4_F_ALCHE_A,{ warp "que_house_s",19,42; end; } else { - if (checkquest(4154) > -1) + if (questprogress(4154)) erasequest 4154; mes "[Jeyna]"; mes "Hey, how did you get in here?"; @@ -847,7 +847,7 @@ que_house_s,83,47,3 script Magic Board#homun_s 4_BOARD3,{ mes "--------------------------"; mes "The rest is sealed because it seems to be a private message."; close2; - if (checkquest(4157) > -1) { + if (questprogress(4157)) { setquest 4158; erasequest 4157; } diff --git a/npc/re/quests/magic_books.txt b/npc/re/quests/magic_books.txt index 0fd885d8f..eac06cb83 100644 --- a/npc/re/quests/magic_books.txt +++ b/npc/re/quests/magic_books.txt @@ -626,7 +626,7 @@ mid_camp,255,244,4 script Galfos 4_M_JOB_WIZARD,{ mes "Are you kidding me? You already have the book!"; close; } - if ((.@i == 1 && checkquest(12218) == 2) || (.@i == 2 && checkquest(12219) == 2 && checkquest(12220) == 2 && checkquest(12221) == 2 && checkquest(12222) == 2)) { + if ((.@i == 1 && questprogress(12218) == 2) || (.@i == 2 && questprogress(12219) == 2 && questprogress(12220) == 2 && questprogress(12221) == 2 && questprogress(12222) == 2)) { mes "Oh my, I sense incredible energy coming from you. This is great! Now we're ready to make the Ultimate Magic Book."; next; mes "[Galfos]"; @@ -676,11 +676,11 @@ dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ mes "When you approach the documents, an Evil Giant that looks like the archive manager tries to call Guard Galton. You should get out of here quickly."; close; } - if (checkquest(12165,"PLAYTIME") == 1) { + if (questprogress(12165,PLAYTIME) == 1) { mes "The documents are making you feel nauseous. You should come back later after your stomach settles."; close; } - if (checkquest(12165,"PLAYTIME") == 2) { + if (questprogress(12165,PLAYTIME) == 2) { mes "You don't feel as nauseous anymore. It should be safe to proceed now."; erasequest 12165; close; @@ -703,7 +703,7 @@ dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ if (mac_book == 4) { if (rand(1,10) == 1) { if (getskilllv(2213) > 0) { - if (checkquest(12218) == 1) { + if (questprogress(12218) == 1) { mes "You already own this document."; close; } @@ -721,7 +721,7 @@ dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ } if (rand(1,10) == 2) { if (getskilllv(2217) > 0) { - if (checkquest(12219) == 1) { + if (questprogress(12219) == 1) { mes "You already own this document."; close; } @@ -739,7 +739,7 @@ dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ } if (rand(1,10) == 3) { if (getskilllv(2217) > 0) { - if (checkquest(12220) == 1) { + if (questprogress(12220) == 1) { mes "You already own this document."; close; } @@ -756,7 +756,7 @@ dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ } if (rand(1,10) == 4) { if (getskilllv(2217) > 0) { - if (checkquest(12221) == 1) { + if (questprogress(12221) == 1) { mes "You already own this document."; close; } @@ -774,7 +774,7 @@ dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ } if (rand(1,10) == 5) { if (getskilllv(2217) > 0) { - if (checkquest(12222) == 1) { + if (questprogress(12222) == 1) { mes "You already own this document."; close; } @@ -807,7 +807,7 @@ function script Magic_Book_Essence { mes "Please lighten your bag."; close; } - if (checkquest(getarg(0)) == 1 && countitem(getarg(1)) >= getarg(2)) { + if (questprogress(getarg(0)) == 1 && countitem(getarg(1)) >= getarg(2)) { specialeffect2 EF_BLIND; specialeffect2 EF_BEGINSPELL; progressbar "ffff00",4; @@ -823,7 +823,7 @@ function script Magic_Book_Essence { mes "^008888You have failed to refine the essence using "+getarg(2)+" "+getitemname(getarg(1))+"s.^000000"; close; } - if (checkquest(getarg(0)) == 2) { + if (questprogress(getarg(0)) == 2) { mes "You've already created "+getarg(3)+" Essence in this area."; close; } diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt index 33758fe9a..e74d14c77 100644 --- a/npc/re/quests/quests_brasilis.txt +++ b/npc/re/quests/quests_brasilis.txt @@ -31,22 +31,22 @@ brasilis,297,307,5 script Angelo#br 1_M_04,{ mes "Gosh... what can I do... ?"; close; } - if (checkquest(9032,PLAYTIME) == 2) { + if (questprogress(9032,PLAYTIME) == 2) { erasequest 9032; } - if (checkquest(9032,PLAYTIME) == 0) { + if (questprogress(9032,PLAYTIME) == 1) { mes "[Angelo]"; mes "The day is not finished yet."; mes "You can only help once a day. Hehe."; close; } - if (checkquest(9030) == 1) { + if (questprogress(9030) == 1) { mes "[Angelo]"; mes "My pets are in the field outside of the village."; mes "Why did they leave? Please find them."; close; } - if (checkquest(9031) == 1) { + if (questprogress(9031) == 1) { mes "[Angelo]"; mes "Oh, thank you. You found all of 3 puppies."; mes "Thanks a lot."; @@ -89,7 +89,7 @@ OnGo: } - script Puppy#bra -1,{ - if (checkquest(9030) == 1) { + if (questprogress(9030) == 1) { if (brazil_kid < 3) { mes "[Puppy]"; mes "bow wow bow wow!!"; @@ -169,9 +169,8 @@ brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{ close; } else { - set .@nQState1,checkquest(9028); - set .@nQState2,checkquest(9029); - if (.@nQState1 == -1) { + .@nQState = questprogress(9028); + if (!.@nQState) { mes "[Lucia]"; mes "Hello."; mes "Have you come here to hunt ^FF0000Strange Hydra^000000s?"; @@ -215,7 +214,7 @@ brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{ close; } } - else if ((.@nQState1 == 0) || (.@nQState1 == 1)) { + else if (.@nQState == 1) { if (countitem(6221) > 0) { mes "[Lucia]"; mes "Hello, you really did it!"; @@ -227,7 +226,7 @@ brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{ delitem 6221,1; //Mystic_Leaf_Cat_Ball completequest 9028; //recall_completequest 9029; - if (.@nQState2 > -1) erasequest 9029; + if (questprogress(9029)) erasequest 9029; setquest 9029; consumeitem 607; //Yggdrasilberry consumeitem 12070; //Luk_Dish05 @@ -290,8 +289,7 @@ brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{ else { mes "[Lucia]"; mes "Oh, ^0000FF"+strcharinfo(0)+"^000000 you're back."; - set .@nCheckTime,checkquest(9029,PLAYTIME); - if ((.@nCheckTime == 0) || (.@nCheckTime == 1)) { + if (questprogress(9029,PLAYTIME) == 1) { mes "I'm so grateful for your help."; mes "Each ^006400Hydra Ball^000000 is provided ^006400every 24 hours^000000"; mes "Please come at the appropriate time."; @@ -299,7 +297,7 @@ brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{ } else { //recall_completequest 9028; - if (.@nQState1 > -1) erasequest 9028; + if (.@nQState) erasequest 9028; completequest 9029; mes "Did you come here to hunt ^FF0000Strange Hydra^000000s?"; next; @@ -2849,8 +2847,7 @@ OnInit: // Iara :: iara.sc //============================================================ brasilis,315,334,5 script Shaman#nk 4_F_BRZ_INDOLD,{ - set .@iara_re,checkquest(4135,PLAYTIME); - if ((.@iara_re == 0) || (.@iara_re == 1)) { + if (questprogress(4135,PLAYTIME) == 1) { mes "[Anori]"; mes "I'm still preparing."; mes "I don't require your help at this time."; @@ -2858,9 +2855,8 @@ brasilis,315,334,5 script Shaman#nk 4_F_BRZ_INDOLD,{ close; } else { - if (checkquest(4135) > 1) erasequest 4135; - set .@iara_q,checkquest(4133); - if ((.@iara_q == 0) || (.@iara_q == 1)) { + if (questprogress(4135) == 2) erasequest 4135; + if (questprogress(4133) == 1) { mes "[Anori]"; mes "To block Iara "; mes "seducing the tribes"; @@ -2914,8 +2910,7 @@ brasilis,315,334,5 script Shaman#nk 4_F_BRZ_INDOLD,{ mes "The tribe is facing a major threat."; close; } - set .@re_q,checkquest(4134); - if (.@re_q == 2) { + if (questprogress(4134) == 2) { mes "[Anori]"; mes "you are..."; mes "the adventurer who came for the"; @@ -3138,7 +3133,7 @@ bra_fild01,188,301,5 script Native Warrior#nk 4_M_BRZ_INDIAN,{ mes "[Native Warrior]"; mes "When will she come out of the waterfall again...?"; next; - if ((checkquest(4133) >= 0) || (checkquest(4134) >= 0)) { + if (questprogress(4133) || questprogress(4134)) { mes "[" + strcharinfo(0) + "]"; mes "(Wh...what's this guy?)"; } diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt index e3d1a7302..a2424cdfc 100644 --- a/npc/re/quests/quests_dewata.txt +++ b/npc/re/quests/quests_dewata.txt @@ -754,7 +754,7 @@ dewata,109,262,4 script Memo#dew_drink 4_M_DEWOLDMAN,{ close; } } - set .@playtime, checkquest(5044,PLAYTIME); + .@playtime = questprogress(5044,PLAYTIME); if (.@playtime == 0) { mes "[Memo]"; mes "Will you help me again tomorrow?"; @@ -913,14 +913,14 @@ dewata,109,262,4 script Memo#dew_drink 4_M_DEWOLDMAN,{ set dew_drink,8; close; } else if (dew_drink == 8) { - if (checkquest(5043,PLAYTIME) == 0) { + if (questprogress(5043,PLAYTIME) == 1) { mes "[Memo]"; mes "... ... ..."; emotion e_swt2; next; mes "- Memo is making an ark. -"; close; - } else if (checkquest(5043,PLAYTIME) == -1) { + } else if (!questprogress(5043,PLAYTIME)) { mes "- There is error in the quest. -"; close; } @@ -968,7 +968,7 @@ dewata,109,262,4 script Memo#dew_drink 4_M_DEWOLDMAN,{ close; } else if (dew_drink == 10) { for(set .@i,0; .@i<7; set .@i,.@i+1) - if (checkquest(5045+.@i) > -1) + if (questprogress(5045+.@i)) set .@j, .@j | (1<<.@i); if (.@j == 0) { mes "[Memo]"; @@ -1166,14 +1166,14 @@ dew_fild01,114,275,4 script Lero#dew_drink 4_M_DEWMAN,{ mes "Although he is lazy and rather careless, he is the best worker."; close; } else if (dew_drink == 4) { - if (checkquest(5038) > -1) { + if (questprogress(5038)) { mes "[Lero]"; mes "You can ask Poby about the best method of gathering nuts where you met him in the forest. He should be able to teach you the technique."; next; mes "[Lero]"; mes "Although he is lazy and rather careless, he is the best worker."; close; - } else if (checkquest(5039) > -1) { + } else if (questprogress(5039)) { if (countitem(6402) < 60) { mes "[Lero]"; mes "Did you gather the nuts already?"; @@ -1226,7 +1226,7 @@ dew_fild01,114,275,4 script Lero#dew_drink 4_M_DEWMAN,{ getitem 6401,30; //Palm_O close; } else if (dew_drink == 7) { - if (checkquest(5042) > -1 && countitem(6401) > 29) { + if (questprogress(5042) && countitem(6401) > 29) { mes "[Lero]"; mes "It is heavier than you might think, so be careful when carrying it."; next; @@ -1266,7 +1266,7 @@ dew_fild01,114,275,4 script Lero#dew_drink 4_M_DEWMAN,{ close; } else if (dew_drink == 10) { for(set .@i,0; .@i<7; set .@i,.@i+1) - if (checkquest(5045+.@i) > -1) + if (questprogress(5045+.@i)) set .@j, .@j | (1<<.@i); if (.@j == 0) { mes "[Lero]"; @@ -1391,7 +1391,7 @@ dew_fild01,259,48,4 script Poby#dew_drink 4_M_DEWBOY,{ emotion e_swt2; close; } else if (dew_drink == 4) { - if (checkquest(5039) > -1) { + if (questprogress(5039)) { if (countitem(6402) > 59) { // Oil_Palm_F mes "[Poby]"; mes "You got all the fruits. Bring them to Mr. Lero."; @@ -1440,11 +1440,11 @@ dew_fild01,259,48,4 script Poby#dew_drink 4_M_DEWBOY,{ mes "[Poby]"; mes "Oh! "+strcharinfo(0)+", we meet again. What's going on?"; - if (checkquest(5047) > -1) + if (questprogress(5047)) set .@count,10; - else if (checkquest(5049) > -1) + else if (questprogress(5049)) set .@count,15; - else if (checkquest(5051) > -1) + else if (questprogress(5051)) set .@count,20; if (.@count) { if (countitem(6401) >= .@count) { @@ -1501,10 +1501,10 @@ dew_fild01,259,48,4 script Poby#dew_drink 4_M_DEWBOY,{ close; } - if (checkquest(5039) > -1) set .@count,60; - else if (checkquest(5046) > -1) set .@count,20; - else if (checkquest(5048) > -1) set .@count,30; - else if (checkquest(5050) > -1) set .@count,40; + if (questprogress(5039)) set .@count,60; + else if (questprogress(5046)) set .@count,20; + else if (questprogress(5048)) set .@count,30; + else if (questprogress(5050)) set .@count,40; if (.@count == 0) { mes "There's a palm tree"; mes "facing the cool wind."; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index d17b63267..e8d493c9b 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -443,8 +443,8 @@ sec_in02,10,42,1 script 13.3 Related Reset 4_MAN_BENKUNI,{ mes "[Reset]"; mes "Resets all quest windows including daily and map quests for 13.3."; freeloop(1); - for(set .@i,12099; .@i<=12216; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + for(.@i = 12099; .@i <= 12216; ++.@i) { + if (questprogress(.@i)) erasequest .@i; } freeloop(0); @@ -455,11 +455,11 @@ sec_in02,10,42,1 script 13.3 Related Reset 4_MAN_BENKUNI,{ //============================================================ function script que_dic { if (!getarg(0)) { - if (checkquest(getarg(1),HUNTING) != 2) return; + if (questprogress(getarg(1),HUNTING) != 2) return; mes getarg(3); } else if (getarg(0) == 1) { - if (checkquest(getarg(1)) == -1) return; + if (!questprogress(getarg(1))) return; if (countitem(getarg(3)) < getarg(4)) { mes "It looks like you are short on the amount."; close; @@ -469,8 +469,8 @@ function script que_dic { delitem getarg(3), getarg(4); } else if (getarg(0) == 2) { - for(set .@i,1; .@i<getargcount(); set .@i,.@i+1) { - if (checkquest(getarg(.@i)) >= 0) + for(.@i = 1; .@i < getargcount(); ++.@i) { + if (questprogress(getarg(.@i))) erasequest getarg(.@i); } return; @@ -507,7 +507,7 @@ dic_in01,48,263,5 script Hunting Dept. 1 Manager 4_MAN_BENKUNI,{ mes "Umm...What are you up to? Anything to do with me?"; close; } - if (checkquest(12159,PLAYTIME) == -1) { + if (!questprogress(12159,PLAYTIME)) { mes "[Hunting Dept. 1 Manager]"; mes "So you didn't get"; mes "any requests yet."; @@ -516,7 +516,7 @@ dic_in01,48,263,5 script Hunting Dept. 1 Manager 4_MAN_BENKUNI,{ mes "you one. Try meeting him."; close; } - else if (checkquest(12159,PLAYTIME) == 2) { + else if (questprogress(12159,PLAYTIME) == 2) { mes "[Hunting Dept. 1 Manager]"; mes "Time limit has expired for the existing request."; next; @@ -577,7 +577,7 @@ dic_in01,51,266,6 script Hunting Dept. 2 Manager 4_MAN_BENKUNI,{ mes "Ha ha, you will need to train a little more to work with me."; close; } - if (checkquest(12160,PLAYTIME) == -1) { + if (!questprogress(12160,PLAYTIME)) { mes "[Hunting Dept. 2 Manager]"; mes "So you didn't get"; mes "any requests yet."; @@ -586,7 +586,7 @@ dic_in01,51,266,6 script Hunting Dept. 2 Manager 4_MAN_BENKUNI,{ mes "you one. Try to find him."; close; } - else if (checkquest(12160,PLAYTIME) == 2) { + else if (questprogress(12160,PLAYTIME) == 2) { mes "[Hunting Dept. 2 Manager]"; mes "Kalipo seems to have another request for you."; next; @@ -646,7 +646,7 @@ dic_in01,51,270,7 script Supply Dept. 1 Manager 4_MAN_BENKUNI,{ mes "You gotta be strong enough to deal with Supply Dept. 1."; close; } - if (checkquest(12161,PLAYTIME) == -1) { + if (!questprogress(12161,PLAYTIME)) { mes "[Supply Dept. 1 Manager]"; mes "So you didn't get"; mes "any requests yet."; @@ -655,7 +655,7 @@ dic_in01,51,270,7 script Supply Dept. 1 Manager 4_MAN_BENKUNI,{ mes "you one. Try meeting him."; close; } - else if (checkquest(12161,PLAYTIME) == 2) { + else if (questprogress(12161,PLAYTIME) == 2) { mes "[Supply Dept. 1 Manager]"; mes "Pura is looking for you."; next; @@ -717,7 +717,7 @@ dic_in01,48,273,8 script Supply Dept. 2 Manager 4_MAN_BENKUNI,{ mes "No way, You can't stand the job of Supply Dept. 2 with that weak body."; close; } - if (checkquest(12162,PLAYTIME) == -1) { + if (!questprogress(12162,PLAYTIME)) { mes "[Supply Dept. 2 Manager]"; mes "So you didn't get"; mes "any requests yet."; @@ -726,7 +726,7 @@ dic_in01,48,273,8 script Supply Dept. 2 Manager 4_MAN_BENKUNI,{ mes "you one. Try meeting him."; close; } - else if (checkquest(12162,PLAYTIME) == 2) { + else if (questprogress(12162,PLAYTIME) == 2) { mes "[Supply Dept. 2 Manager]"; mes "I erased all records related with the previous request. Tragis is looking for you so hurry up to meet him."; next; @@ -784,7 +784,7 @@ dic_in01,43,273,1 script Transport Dept. 1 Mgr 4_MAN_BENKUNI,{ mes "You're not qualified. You won't last a day with your strength working here at Transport Dept. 1."; close; } - if (checkquest(12163,PLAYTIME) == -1) { + if (!questprogress(12163,PLAYTIME)) { mes "[Transport Dept. 1 Manager]"; mes "So you didn't get"; mes "any requests yet."; @@ -793,7 +793,7 @@ dic_in01,43,273,1 script Transport Dept. 1 Mgr 4_MAN_BENKUNI,{ mes "you one. Try meeting him."; close; } - else if (checkquest(12163,PLAYTIME) == 2) { + else if (questprogress(12163,PLAYTIME) == 2) { mes "[Transport Dept. 1 Manager]"; mes "I erased all records related with the previous request. Calyon is looking for you so hurry up to meet him."; next; @@ -858,7 +858,7 @@ dic_in01,40,270,2 script Transport Dept. 2 Mgr 4_MAN_BENKUNI,{ mes "You're not qualified. You won't last a day with your strength working here at Transport Dept. 2."; close; } - if (checkquest(12164) == -1) { + if (!questprogress(12164)) { mes "[Transport Dept. 2 Manager]"; mes "So you didn't get"; mes "any requests yet."; @@ -867,7 +867,7 @@ dic_in01,40,270,2 script Transport Dept. 2 Mgr 4_MAN_BENKUNI,{ mes "you one. Try meeting him."; close; } - else if (checkquest(12164,PLAYTIME) == 2) { + else if (questprogress(12164,PLAYTIME) == 2) { mes "[Transport Dept. 2 Manager]"; mes "I erased all records related with the previous request. Moltuka is looking for you so hurry up to meet him."; next; @@ -1026,12 +1026,12 @@ dic_in01,40,193,1 script Papyrus#0001 4_MAN_NITT,{ mes "When you try to open and read a document, a Sapha manager motions to call Guard Galten. Let's get out of here quickly."; close; } - if (checkquest(12165,PLAYTIME) == 2) { + if (questprogress(12165,PLAYTIME) == 2) { mes "Feeling a bit better"; erasequest 12165; close; } - else if (checkquest(12165,PLAYTIME) != -1) { + else if (questprogress(12165,PLAYTIME)) { mes "Ugh... feel dizzy from simply staring at the document. Will come back after cooling down"; close; } @@ -1099,7 +1099,7 @@ dic_in01,40,193,1 script Papyrus#0001 4_MAN_NITT,{ close; function eldicastes_dp { - if (checkquest(getarg(0)) >= 0) { + if (questprogress(getarg(0))) { mes "You've found a document you already have."; close; } @@ -1120,7 +1120,7 @@ dic_in01,25,187,0 duplicate(Document Package#main) Document Package#0004 CLEAR_N // Unknown Relics //============================================================ function script unknown_d { - if (checkquest(getarg(0)) == -1) { + if (!questprogress(getarg(0))) { mes "You see some traces of digging."; close; } @@ -1465,14 +1465,14 @@ dic_in01,294,276,5 script Secret Adjutant#ep133_2 4_M_CATMAN2,{ } } else if (ep13_3_ahtdayq == 2) { - if (checkquest(7200,PLAYTIME) == 0 || checkquest(7200,PLAYTIME) == 1) { + if (questprogress(7200,PLAYTIME) == 1) { mes "[Cheshire]"; mes "Not just yet."; mes "We must plan the cleanup near the crack carefully."; mes "Come back later."; close2; } - else if (checkquest(7200,PLAYTIME) == 2) { + else if (questprogress(7200,PLAYTIME) == 2) { mes "[Cheshire]"; mes "Back to work today."; mes "Clotted Bloodstain, Piece of Frozen Skin, Strange Magic Stone.."; @@ -1482,7 +1482,7 @@ dic_in01,294,276,5 script Secret Adjutant#ep133_2 4_M_CATMAN2,{ mes "Collect 10 of each as always."; mes "Got it?"; set ep13_3_ahtdayq, 1; - if (checkquest(7200,PLAYTIME) >= 0) erasequest 7200; + if (questprogress(7200,PLAYTIME)) erasequest 7200; setquest 7201; next; mes "You've received a request from Cheshire to clean up the crack area."; @@ -2339,10 +2339,10 @@ dicastes01,223,190,1 script Calyon#pa8029 4_MAN_NITT,{ mes "Ha ha, come back again after you are trained more. I have no request that fits you."; close; } - if (checkquest(12163,PLAYTIME) == 2) { + if (questprogress(12163,PLAYTIME) == 2) { mes "Calculate your request activities with the ^800080Transport Dept. 1 Manager^000000 at Operations and then come back."; close; - } else if (checkquest(12163,PLAYTIME) != -1) { + } else if (questprogress(12163,PLAYTIME)) { mes "We're done for the day. You can report back to the ^800080Transport Dept. 1 Manager^000000 at Operations. Good luck."; close; } @@ -2512,12 +2512,12 @@ dicastes01,211,178,2 script Moltuka#pa0829 4_MAN_NITT,{ mes "Ha ha, come back again after you are trained more. I have no request that fits you."; close; } - if (checkquest(12164,PLAYTIME) == 2) { + if (questprogress(12164,PLAYTIME) == 2) { mes "[Moltuka]"; mes "Have you met the ^990099Transport Dept. 2 Manager^000000 at Operations? I will give you a new request after you clear your request history."; close; } - else if (checkquest(12164,PLAYTIME) != -1) { + else if (questprogress(12164,PLAYTIME)) { mes "[Moltuka]"; mes "I don't have any requests for you now. Report back to the ^990099Transport Dept. 2 Manager^000000 at Operations after you complete all requests."; close; @@ -2736,13 +2736,13 @@ dicastes01,175,217,5 script Kalipo#pa0829 4_MAN_NITT,{ mes "Ha ha ha, many other adventurers are giving a helping hand. I'll see you next time."; close; } - if (checkquest(12160,PLAYTIME) == 2) { + if (questprogress(12160,PLAYTIME) == 2) { mes "[Kalipo]"; mes "Please come back after checking"; mes "previous requests with the ^990099Hunting Dept. 2 Manager^000000."; close; } - else if (checkquest(12160,PLAYTIME) > -1) { + else if (questprogress(12160,PLAYTIME)) { mes "[Kalipo]"; mes "I do not have any additional requests. Please report to the ^990099Hunting Dept. 2 Manager^000000 at Operations to report request completion."; close; @@ -2878,12 +2878,12 @@ dicastes01,187,230,5 script Laponte#pa0829 4_MAN_NITT,{ mes "Ha ha ha, many other adventurers are giving a helping hand. I'll see you next time."; close; } - if (checkquest(12159,PLAYTIME) > -1 && checkquest(12159,PLAYTIME) < 2) { + if (questprogress(12159,PLAYTIME) && questprogress(12159,PLAYTIME) != 2) { mes "[Laponte]"; mes "I do not have any additional requests. Please report to the ^990099Hunting Dept. 1 Manager^000000 at Operations to report request completion."; close; } - else if (checkquest(12159,PLAYTIME) == 2) { + else if (questprogress(12159,PLAYTIME) == 2) { mes "[Laponte]"; mes "Please come back after checking"; mes "previous requests with the ^990099Hunting Dept. 1 Manager^000000."; @@ -3050,12 +3050,12 @@ dicastes01,208,230,3 script Pura#pa0829 4_MAN_NITT,{ mes "We are not that unfortunate to receive help from you."; close; } - if (checkquest(12161,PLAYTIME) == 2) { + if (questprogress(12161,PLAYTIME) == 2) { mes "[Pura]"; mes "Have you already met the ^990099Supply Dept. 1 Manager^000000 at Operations? I will give you a new request after you clear your request history."; close; } - else if (checkquest(12161,PLAYTIME) > -1) { + else if (questprogress(12161,PLAYTIME)) { mes "[Pura]"; mes "I don't have any requests for you now. Report back to the ^990099Supply Dept. 1 Manager^000000 at Operations after you complete all requests."; close; @@ -3240,12 +3240,12 @@ dicastes01,225,211,3 script Tragis#pa0829 4_MAN_NITT,{ mes "It is pretty embarassing that you are looking for a request with your level, you know that?"; close; } - if (checkquest(12162,PLAYTIME) == 2) { + if (questprogress(12162,PLAYTIME) == 2) { mes "[Tragis]"; mes "Calculate your request activities with the ^990099Supply Dept. 2 Manager^000000 at Operations and then come back."; close; } - else if (checkquest(12162,PLAYTIME) > -1) { + else if (questprogress(12162,PLAYTIME)) { mes "[Tragis]"; mes "I don't have any requests for you now. Report back to the ^990099Supply Dept. 2 Manager^000000 at Operations after you complete all requests."; close; @@ -3845,9 +3845,10 @@ dic_in01,245,119,4 script Shay#ep133_13 4_M_ACROSS,{ "7190","Galtens are interested in the Cat Merchant for their cat ears."; mes "[" + strcharinfo(0) + "]"; mes "I'm trying to organize the information I've collected."; - for (set .@size, getarraysize(.@ward$); .@i < .@size; set .@i, .@i + 2) - if (checkquest(atoi(.@ward$[.@i])) >= 0) { - set .@sealall, .@sealall + 1; + .@size = getarraysize(.@ward$); + for (.@i = 0; .@i < .@size; .@i += 2) + if (questprogress(atoi(.@ward$[.@i]))) { + ++.@sealall; mes .@ward$[.@i+1]; } if (!.@sealall) mes "But what should I do with the collected information?"; @@ -4050,8 +4051,8 @@ dic_in01,245,119,4 script Shay#ep133_13 4_M_ACROSS,{ mes "Meet Ahat by collecting exploit certifications."; mes "And then find doubt what is the relationship between him and the crack."; set ep13_3_secret, 12; - for (set .@i, 0; .@i < getarraysize(.@quest); set .@i, .@i + 1) - if (checkquest(.@quest[.@i]) >= 0) erasequest .@quest[.@i]; + for (.@i = 0; .@i < getarraysize(.@quest); ++.@i) + if (questprogress(.@quest[.@i])) erasequest .@quest[.@i]; setquest 7197; break; } @@ -4315,7 +4316,7 @@ dicastes01,207,210,5 script Walking Knit#ep133_15 4_MAN_BENKUNI,{ mes "Ah, did you see the group of cats in front of the castle?"; mes "They are really soft and cuddly unlike us."; next; - if (checkquest(7188) >= -1) { + if (questprogress(7188)) { mes "[Knit]"; mes "And especially their ear and tail!!"; next; @@ -4404,7 +4405,7 @@ dicastes01,112,248,5 script Resting Piom#ep133_16 4_MAN_PIOM5,{ mes "Huh? You're... human!"; mes "Why are you here?"; next; - if (checkquest(7189) >= -1) { + if (questprogress(7189)) { select("About a human with cat ears.."); mes "[Piom]"; mes "HAHAHAHA!!!"; @@ -4476,7 +4477,7 @@ dicastes01,249,140,3 script Training Galten#ep133_17 4_MAN_GALTUN,{ mes "Hmm? Aren't you the outsider that came here awhile ago?"; mes "Have you come to see the training grounds?"; next; - if (checkquest(7190) >= -1) { + if (questprogress(7190)) { select("About a human with cat ears.."); mes "[Galten]"; mes "Cat ears?"; @@ -4883,14 +4884,14 @@ dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{ if (countitem(.@item[.@type]) == 10) { mes "Collected enough for Cheshire but"; mes "you may need some more to report separately."; - if (checkquest(7202) == -1) setquest 7202; + if (!questprogress(7202)) setquest 7202; close; } mes "Not enough was collected to fill Cheshire's request."; close; } else if (countitem(.@item[.@type]) == 10) { - if (checkquest(7202) >= 0) { + if (questprogress(7202)) { setarray .@str$, "stone fragments","bloodstains","pieces of skin"; mes "Need more " + .@str$[.@type] + " to report back to Doha at the expedition camp."; } @@ -5219,9 +5220,10 @@ dic_in01,165,104,0 script Frede#13_3_in 4_MAN_PIOM,{ } else if (ep13_3_bra == 4) { setarray .@quest_id, 11159,11160,11161,11162,11163,11164; - for (set .@size, getarraysize(.@quest_id); .@i < .@size; set .@i, .@i + 1) - if (checkquest(.@quest_id[.@i]) == -1) { - set .@fail, 1; + .@size = getarraysize(.@quest_id); + for (.@i = 0; .@i < .@size; ++.@i) + if (!questprogress(.@quest_id[.@i])) { + .@fail = true; break; } if (!.@fail) { @@ -5307,9 +5309,10 @@ dic_in01,165,104,0 script Frede#13_3_in 4_MAN_PIOM,{ close; } setarray .@quest_id, 11165,11166,11167,11168,11169,11170; - for (set .@size, getarraysize(.@quest_id); .@i < .@size; set .@i, .@i + 1) - if (checkquest(.@quest_id[.@i]) == -1) { - set .@fail, 1; + .@size = getarraysize(.@quest_id); + for (.@i = 0; .@i < .@size; ++.@i) + if (!questprogress(.@quest_id[.@i])) { + .@fail = true; break; } if (!.@fail) { @@ -5360,7 +5363,7 @@ dic_dun01,205,43,5 script Brian#ep13_3_ 4_MAN_PIOM4,{ close; } else if (ep13_3_bra < 8) { - if (checkquest(11159) >= 0 || ep13_3_bra != 4) { + if (questprogress(11159) || ep13_3_bra != 4) { mes "[Brian]"; mes "Oh... that reminds me, how many days passed since I came here..."; mes "Do you happen to know what day it is today?"; @@ -5399,7 +5402,7 @@ dic_dun01,205,43,5 script Brian#ep13_3_ 4_MAN_PIOM4,{ close; } else if (ep13_3_bra == 8) { - if (checkquest(11165) >= 0) { + if (questprogress(11165)) { mes "[Brian]"; mes "I'm out of Bradium already."; mes "Frede has been nagging me about this all the time but now I see why."; @@ -5461,7 +5464,7 @@ dic_dun01,153,107,4 script Tyler#13_3 4_MAN_PIOM6,{ close; } else if (ep13_3_bra == 4) { - if (checkquest(11161) >= 0) { + if (questprogress(11161)) { mes "[Tyler]"; mes "If you happen to bump into him in the village, please tell him I'm fine and not to worry."; close; @@ -5523,7 +5526,7 @@ dic_dun01,153,107,4 script Tyler#13_3 4_MAN_PIOM6,{ close; } else if (ep13_3_bra == 8) { - if (checkquest(11167) >= 0) { + if (questprogress(11167)) { mes "[Tyler]"; mes "Oh!! I was out of Bradium. How did you know!"; mes "Thanks!"; @@ -5591,7 +5594,7 @@ dic_dun01,235,243,0 script John#13_3 4_MAN_PIOM,{ close; } else if (ep13_3_bra == 4) { - if (checkquest(11160) >= 0) { + if (questprogress(11160)) { mes "[John]"; mes "Oh well..."; mes "There... is nothing to worry about."; @@ -5645,7 +5648,7 @@ dic_dun01,235,243,0 script John#13_3 4_MAN_PIOM,{ close; } else if (ep13_3_bra == 8) { - if (checkquest(11166) >= 0) { + if (questprogress(11166)) { mes "[John]"; mes "......"; mes "Thanks...."; @@ -5691,7 +5694,7 @@ dic_dun02,110,127,5 script Rose#13_3 4_MAN_PIOM6,{ close; } else if (ep13_3_bra == 4) { - if (checkquest(11162) >= 0) { + if (questprogress(11162)) { mes "[Rose]"; mes "Tell him there is no problem at all except that I am too good at my job."; mes "Because I'm perfect."; @@ -5729,7 +5732,7 @@ dic_dun02,110,127,5 script Rose#13_3 4_MAN_PIOM6,{ close; } else if (ep13_3_bra == 8) { - if (checkquest(11168) >= 0) { + if (questprogress(11168)) { mes "[Rose]"; mes "I'll return to the village soon."; mes "We can meet up then~"; @@ -5788,7 +5791,7 @@ dic_dun01,64,107,7 script Bain#13_3 4_MAN_PIOM4,{ close; } else if (ep13_3_bra == 4) { - if (checkquest(11163) >= 0) { + if (questprogress(11163)) { mes "[Bain]"; mes "Just tell him I'm doing well."; mes "Simple, isn't it?"; @@ -5819,7 +5822,7 @@ dic_dun01,64,107,7 script Bain#13_3 4_MAN_PIOM4,{ close; } else if (ep13_3_bra == 8) { - if (checkquest(11169) >= 0) { + if (questprogress(11169)) { mes "[Bain]"; mes "But I will be in trouble if I don't go back to the village for Bradium."; next; @@ -5883,7 +5886,7 @@ dic_dun01,58,225,4 script Lash#13_3 4_MAN_PIOM5,{ close; } else if (ep13_3_bra == 4) { - if (checkquest(11164) >= 0) { + if (questprogress(11164)) { mes "[Lash]"; mes "If you'd like to tell him how I'm doing, look at my forearm. Doesn't it spell out 'Strong' on it?"; next; @@ -5929,7 +5932,7 @@ dic_dun01,58,225,4 script Lash#13_3 4_MAN_PIOM5,{ close; } else if (ep13_3_bra == 8) { - if (checkquest(11170) >= 0) { + if (questprogress(11170)) { mes "[Lash]"; mes "Wow!!!!"; mes "You've saved me!"; @@ -6050,7 +6053,7 @@ dic_in01,349,129,5 script Bouy#13_3 4_MAN_BENKUNI,{ close; } else if (ep13_3_bra == 7) { - if (checkquest(11175,PLAYTIME) > 1) { + if (questprogress(11175,PLAYTIME) == 2) { mes "[Bouy]"; mes "I did it!"; mes "I was a bit nervous because it has been a long time since I did manual work but I think I did a good job."; diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt index 0bc237d58..f7776ec81 100644 --- a/npc/re/quests/quests_eclage.txt +++ b/npc/re/quests/quests_eclage.txt @@ -347,7 +347,7 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ emotion e_sob; close; } - if (checkquest(11312) == -1) { + if (!questprogress(11312)) { mes "[Fairy Carpenter]"; mes "This area is kind of broken, so be careful."; mes "Otherwise, you'll fall aaaaaall the way down."; @@ -743,7 +743,7 @@ ecl_in04,109,215,2 script Hiel#pa0829 4_M_FAIRYSCHOLAR,{ // For Eclage //============================================================ function script F_Eclage_Traveler { - if (checkquest(7411) > -1 && checkquest(7412) > -1 && checkquest(7413) > -1) { + if (questprogress(7411) && questprogress(7412) && questprogress(7413)) { cutin "minuel01.bmp",4; donpcevent "Eclage Guard#tl01::OnEnable"; mes "[Eclage Guard]"; @@ -792,7 +792,7 @@ function script F_Eclage_Traveler { ecl_in01,32,52,4 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{ if (ep14_2_tl == 0) { - if (checkquest(7411) == -1) { + if (!questprogress(7411)) { mes "[Fome]"; mes "Come here and have a talk with us."; mes "My name is Fome and I'm from the central region of Alpheim."; @@ -903,7 +903,7 @@ ecl_in01,32,52,4 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{ close; } OnTouch: - if (ep14_2_tl == 0 && checkquest(7411) == -1 && checkquest(7412) == -1 && checkquest(7413) == -1) { + if (ep14_2_tl == 0 && !questprogress(7411) && !questprogress(7412) && !questprogress(7413)) { mes "A group of travelers of Alpheim are having a conversation."; emotion e_loud; next; @@ -920,7 +920,7 @@ OnTouch: ecl_in01,32,51,6 script Traveler Litrip#tl02 4_M_DOGTRAVELER,{ if (ep14_2_tl == 0) { - if (checkquest(7412) == -1) { + if (questprogress(7412)) { mes "[Litrip]"; mes "Oh, look at this strange traveler."; mes "Come here. My name is Litrip."; @@ -1008,7 +1008,7 @@ ecl_in01,32,51,6 script Traveler Litrip#tl02 4_M_DOGTRAVELER,{ ecl_in01,35,51,2 script Traveler Chiba#tl03 4_M_DOGTRAVELER2,{ if (ep14_2_tl == 0) { - if (checkquest(7413) == -1) { + if (questprogress(7413)) { mes "[Chiba]"; mes "You're human from Midgard."; mes "I'm Chiba."; @@ -1157,7 +1157,7 @@ ecl_in01,82,70,2 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{ mes "I see you pretty often."; mes "I was notified in advance that the Chief of Staff requested for an audience."; next; - if (checkquest(7416,PLAYTIME) < 2) { + if (questprogress(7416,PLAYTIME) != 2) { mes "[Eclage Guard]"; mes "But I'm afraid it's too early."; mes "I think you have to wait for a while."; @@ -1210,7 +1210,7 @@ ecl_in01,82,70,2 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{ end; } } else if (ep14_2_tl == 5) { - if (checkquest(7418) == -1) { + if (!questprogress(7418)) { cutin "minuel01.bmp",2; mes "[Eclage Guard]"; mes "Eh, good to see you again."; @@ -1428,7 +1428,7 @@ ecl_in03,245,93,2 script Chief of Staff#tl01 4_F_FAIRY,{ warp "ecl_in01",47,28; end; } else if (ep14_2_tl == 3) { - if (checkquest(7416,PLAYTIME) < 2) { + if (questprogress(7416,PLAYTIME) != 2) { mes "[Shenime]"; mes "You need to wait a little longer to see Mayor Jun."; mes "He is pretty busy, so please bear with us."; @@ -1618,7 +1618,7 @@ ecl_fild01,205,86,4 script Eclage Messenger Roy#tl 4_M_FAIRYSOLDIER2,{ mes "...Ah... I'm just feeling sorry for myself, so just continue on your way."; close; } else { - if (checkquest(7419) == -1) { + if (!questprogress(7419)) { mes "[Roy]"; mes "It's hard."; mes "It really is hard."; @@ -1705,7 +1705,7 @@ eclage,112,40,4 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{ mes "I hope you enjoy your trip."; close; } else { - if (checkquest(7420) == -1) { + if (!questprogress(7420)) { mes "[Leo]"; mes "Hi, how are you?"; emotion e_gasp; diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt index 0511a1e55..f6e55302c 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -1100,12 +1100,12 @@ mal_in02,179,57,1 script Geologist Mali#mal 4_CAT_ADV1,{ getitem 6422,20; //Egrade_Coin close; } else if (ma_tomas > 99) { - if (checkquest(11240) > -1 || checkquest(11241) > -1) { + if (questprogress(11240) || questprogress(11241)) { mes "[Geologist Mali]"; mes "Please listen to ^6666ccmy assistant, Bob^000000 in detail, mew~."; mes "Get out of here and visit the ^6666cca room on your right^000000, mew~"; close; - } else if (checkquest(11242) > -1) { + } else if (questprogress(11242)) { mes "[Geologist Mali]"; mes "Ah! Bob complimented you so much on your great job, mew~"; mes "Please help us next time again when you can, mew~"; @@ -1113,13 +1113,13 @@ mal_in02,179,57,1 script Geologist Mali#mal 4_CAT_ADV1,{ getitem 6422,4; //Egrade_Coin close; } else { - if (checkquest(11243,PLAYTIME) == 0 || checkquest(11243,PLAYTIME) == 1) { + if (questprogress(11243,PLAYTIME) == 1) { mes "[Geologist Mali]"; mes "Don't overdo yourself, mew~"; mes "It'd be bad if your health gets worse, mew~"; close; } - if (checkquest(11243,PLAYTIME) == 2) + if (questprogress(11243,PLAYTIME) == 2) erasequest 11243; mes "[Geologist Mali]"; mes "There is a lot more repairing left to do for today!"; @@ -1292,10 +1292,10 @@ mal_in02,140,94,0 script Bob#mal 4_CAT_DOWN,{ changequest 11223,11224; close; } else if (ma_tomas > 99) { - if (checkquest(11240) > -1) { + if (questprogress(11240)) { set @mal_bob_q,2; goto L_Quest1; - } else if (checkquest(11241) > -1) + } else if (questprogress(11241)) goto L_Quest2; } mes "[Bob]"; @@ -1307,7 +1307,7 @@ mal_in02,140,94,0 script Bob#mal 4_CAT_DOWN,{ - script Crack#mal0 -1,{ if (.off) end; // Official script uses a 1-second timer to disable cracks. Added to prevent abuse. - if (ma_tomas == 15 || checkquest(11241) > -1) { + if (ma_tomas == 15 || questprogress(11241)) { if (countitem(6434) < 1) { mes "- To repair the crack -"; mes "- you need a Fix Kit. -"; @@ -1363,7 +1363,7 @@ mal_in02,140,94,0 script Bob#mal 4_CAT_DOWN,{ set ma_tomas,16; changequest 11222,11223; } - if (checkquest(11241) > -1) { + if (questprogress(11241)) { changequest 11241,11242; } } else { @@ -1805,7 +1805,7 @@ mal_in01,114,169,5 script Rican#mal 4_CAT_SAILOR4,{ mes "If you see my son, please tell him to get back soon~"; close; } else if (ma_tomas > 99) { - if (checkquest(11238) != -1) { + if (questprogress(11238)) { if (countitem(6435) < 30) { mes "[Rican]"; mes "You need exactly 30 to get a set!"; @@ -1819,13 +1819,13 @@ mal_in01,114,169,5 script Rican#mal 4_CAT_SAILOR4,{ setquest 11239; getitem 6422,5; //Egrade_Coin close; - } else if (checkquest(11239,PLAYTIME) == 0 || checkquest(11239,PLAYTIME) == 1) { + } else if (questprogress(11239,PLAYTIME) == 1) { mes "[Rican]"; mes "Would you like to take a rest for a while?"; mes "It hasn't been a day yet since you last worked~"; close; } else { - if (checkquest(11239,PLAYTIME) == 2) + if (questprogress(11239,PLAYTIME) == 2) erasequest 11239; mes "[Rican]"; mes "Hehe~"; @@ -1900,7 +1900,7 @@ mal_in01,116,168,0 script Dry Machine#mal 2_SLOT_MACHINE,{ mes "Your inventory is too full to proceed. Come back after reducing your load."; close; } - if (ma_tomas == 9 || checkquest(11238) > -1) { + if (ma_tomas == 9 || questprogress(11238)) { if (rand(1,5) == 4) { mes "- As I put my hand in the sand -"; mes "- a fresh smell comes out. -"; @@ -2385,15 +2385,15 @@ mal_dun01,136,122,3 script Biscuit#mal 4_ASTER,{ getitem 12636,20; //Malang_Sp_Can close; } else if (ma_tomas > 99) { - if (checkquest(11244) > -1) { + if (questprogress(11244)) { set @mal_bob_q,2; goto L_Quest; - } else if (checkquest(11245,PLAYTIME) == 0 || checkquest(11245,PLAYTIME) == 1) { + } else if (questprogress(11245,PLAYTIME) == 1) { mes "[Biscuit]"; mes "I'll call you when I need you, so don't worry!"; close; } else { - if (checkquest(11245,PLAYTIME) == 2) + if (questprogress(11245,PLAYTIME) == 2) erasequest 11245; mes "[Biscuit]"; mes "It's the time for Star Candy to have a meal."; @@ -2890,7 +2890,7 @@ malangdo,175,206,3 script Gobonge#ml 4_CAT_SAILOR5,{ mes "- Can't go next step due to having too many items. -"; close; } - if (checkquest(1152,PLAYTIME) == 0) { + if (!questprogress(1152,PLAYTIME)) { mes "[Gobonge]"; mes "Hmm, investigation is not enough."; mes "We need go back to basic point."; @@ -2898,10 +2898,10 @@ malangdo,175,206,3 script Gobonge#ml 4_CAT_SAILOR5,{ mes "I might be in pain of stomach"; mes "like usual."; close; - } else if (checkquest(1152,PLAYTIME) == 1) { + } else if (questprogress(1152,PLAYTIME) == 1) { erasequest 1152; set malang_bad_guys,0; - } else if (checkquest(1152,PLAYTIME) == 2) { + } else if (questprogress(1152,PLAYTIME) == 2) { completequest 1152; erasequest 1152; set malang_bad_guys,0; @@ -3451,7 +3451,7 @@ malangdo,125,147,3 script Patrol Leader#ml 4_CAT_SAILOR2,{ close; } } else if (malang_bad_guys == 11) { - if (checkquest(1154,HUNTING) == 2) { + if (questprogress(1154,HUNTING) == 2) { mes "[Patrol Leader]"; mes "Wow, you did to ^0000FFRed Eruma^000000 so badly!"; mes "I am impressed at your work."; @@ -3654,7 +3654,7 @@ mal_in02,76,63,7 script Cleanyang 4_CAT_SAILOR1,{ close; } } else if (mal_qook == 1) { - if (checkquest(7261) != -1 && checkquest(7262) != -1 && checkquest(7263) != -1) { + if (questprogress(7261) && questprogress(7262) && questprogress(7263)) { emotion e_omg; mes "[Cleanyang]"; mes "Uh. What is that? Meow."; @@ -3839,14 +3839,14 @@ mal_in02,76,63,7 script Cleanyang 4_CAT_SAILOR1,{ next; switch(select("It's time to promise~:I'm here to see the result~:Shake your butt~")) { case 1: - if (checkquest(7267,PLAYTIME) == 0) { + if (!questprogress(7267,PLAYTIME)) { mes "[Cleanyang]"; mes "Uh? Not yet."; mes "Today's cat's ship biscuit is not provided yet, so I will know that after wait little bit more."; mes "It might be after chef's distribution of cat's ship biscuit."; close; } - if (checkquest(7268) != -1) { + if (questprogress(7268)) { mes "[Cleanyang]"; mes "My service to you today."; mes "Recently, there are 9 spot that hided cat's ship biscuit as well."; @@ -3860,7 +3860,7 @@ mal_in02,76,63,7 script Cleanyang 4_CAT_SAILOR1,{ mes "Please search the 9 spot where hiding frequently."; close; } - if (checkquest(7267,PLAYTIME) == 2) + if (questprogress(7267,PLAYTIME) == 2) completequest 7267; erasequest 7267; mes "[Cleanyang]"; @@ -3884,15 +3884,15 @@ mal_in02,76,63,7 script Cleanyang 4_CAT_SAILOR1,{ close; } case 2: - if (checkquest(7268) == -1) { + if (!questprogress(7268)) { mes "[Cleanyang]"; mes "Um? Nobody request for collecting cat's ship biscuit today."; mes "By the way, what is the result report?"; mes "Are you sick?"; close; } - if (checkquest(7261) != -1 && checkquest(7262) != -1 && checkquest(7263) != -1 && checkquest(7269) != -1 && checkquest(7270) != -1 && - checkquest(7271) != -1 && checkquest(7272) != -1 && checkquest(7273) != -1 && checkquest(7274) != -1 && checkquest(7275) != -1) { + if (questprogress(7261) && questprogress(7262) && questprogress(7263) && questprogress(7269) && questprogress(7270) && + questprogress(7271) && questprogress(7272) && questprogress(7273) && questprogress(7274) && questprogress(7275)) { mes "[Cleanyang]"; mes "Um, the rising cat's ship biscuit spot!"; mes "Did you collect all fully?"; @@ -3953,7 +3953,7 @@ mal_in02,29,67,0 script #CaptainRoom3 CLEAR_NPC,{ close; } if (mal_qook == 1) { - if (checkquest(7261) == -1) { + if (!questprogress(7261)) { mes "Lots of junk are piled up in a corner of captain's room."; mes "Cleanyang might not clean in a corner because it is not within his hand."; next; @@ -3987,7 +3987,7 @@ mal_in02,29,67,0 script #CaptainRoom3 CLEAR_NPC,{ setquest 7261; getitem 11536,1; //Cat_Hard_Biscuit next; - if (checkquest(7261) != -1 && checkquest(7262) != -1 && checkquest(7263) != -1) { + if (questprogress(7261) && questprogress(7262) && questprogress(7263)) { mes "I guess I searched pretty enough."; mes "Let's tell Cleanyang that is infested of insects due to cat's ship biscuit is left long time."; close; @@ -4000,8 +4000,8 @@ mal_in02,29,67,0 script #CaptainRoom3 CLEAR_NPC,{ mes "I think it's ok now due to we removed all of them."; close; } - if (checkquest(7268) != -1) { - if (checkquest(7261) == -1) { + if (questprogress(7268)) { + if (!questprogress(7261)) { mes "Lots of junk are piled up in a corner of captain's room."; mes "Cleanyng might not clean in a corner because it is not within his hand."; mes "He reached out and search under the junk."; @@ -4031,8 +4031,8 @@ mal_in02,183,49,0 script #MeetingFloor4 CLEAR_NPC,{ mes "- You have too many items so you can't continue the quest. -"; close; } - if (mal_qook == 1 || checkquest(7268) != -1) { - if (checkquest(7263) == -1) { + if (mal_qook == 1 || questprogress(7268)) { + if (!questprogress(7263)) { mes "This is ventilation window on the floor. It is really close to Cooking table"; mes "I'm trying to ignore that but it is on my mind. What should I do?"; next; @@ -4056,7 +4056,7 @@ mal_in02,183,49,0 script #MeetingFloor4 CLEAR_NPC,{ getitem 11536,1; //Cat_Hard_Biscuit if (mal_qook == 1) { next; - if (checkquest(7261) != -1 && checkquest(7262) != -1 && checkquest(7263) != -1) { + if (questprogress(7261) && questprogress(7262) && questprogress(7263)) { mes "I guess I searched pretty enough."; mes "Let's tell Cleanyang that is infested of insects due to cat's ship biscuit is left long time."; } else @@ -4078,8 +4078,8 @@ mal_in02,103,22,0 script #MalBed5 CLEAR_NPC,{ mes "- You have too many items so you can't continue the quest. -"; close; } - if (mal_qook == 1 || checkquest(7268) != -1) { - if (checkquest(7262) == -1) { + if (mal_qook == 1 || questprogress(7268)) { + if (!questprogress(7262)) { mes "This is bed for sailors. There is too much hair and so messy."; mes "At the corner of under the bed is does not reached hand so I'm thinking too much about that."; next; @@ -4096,7 +4096,7 @@ mal_in02,103,22,0 script #MalBed5 CLEAR_NPC,{ getitem 11536,1; //Cat_Hard_Biscuit if (mal_qook == 1) { next; - if (checkquest(7261) != -1 && checkquest(7262) != -1 && checkquest(7263) != -1) { + if (questprogress(7261) && questprogress(7262) && questprogress(7263)) { mes "I guess I searched pretty enough."; mes "Let's tell Cleanyang that is infested of insects due to cat's ship biscuit is left long time."; } else @@ -4123,8 +4123,8 @@ malangdo,141,178,0 script #Darkweed6 CLEAR_NPC,{ mes "- You have too many items so you can't continue the quest. -"; close; } - if (checkquest(7268) != -1) { - if (checkquest(7269) == -1) { + if (questprogress(7268)) { + if (!questprogress(7269)) { mes "Many weeds are growing in rest area near cat tower."; mes "It's easily ignored, so it's on my mind."; next; @@ -4160,9 +4160,9 @@ malangdo,133,134,0 script Strange Pile of Sand#7 4_SOIL,{ mes "- You have too many items so you can't continue the quest. -"; close; } - if (checkquest(7268) != -1) { + if (questprogress(7268)) { set .@quest, (strnpcinfo(0) == "Strange Pile of Sand#7")?7270:7275; - if (checkquest(.@quest) == -1) { + if (!questprogress(.@quest)) { mes "The pile of sand is billowed like a grave. Should be something in there."; mes "According to rumors, cats have a habit to bury with sand after stool..."; next; @@ -4204,8 +4204,8 @@ malangdo,232,131,0 script #UnderStairs8 CLEAR_NPC,{ mes "- You have too many items so you can't continue the quest. -"; close; } - if (checkquest(7268) != -1) { - if (checkquest(7271) == -1) { + if (questprogress(7268)) { + if (!questprogress(7271)) { mes "Some weeds are growing under the low stairs."; mes "It's really hard to find something fell under the stairs.."; next; @@ -4238,8 +4238,8 @@ mal_in01,74,20,0 script #CornerTower9 CLEAR_NPC,{ mes "- You have too many items so you can't continue the quest. -"; close; } - if (checkquest(7268) != -1) { - if (checkquest(7272) == -1) { + if (questprogress(7268)) { + if (!questprogress(7272)) { mes "This cat tower is for playing and resting."; mes "Dust is piled up because there is gap between the foothold and ground."; next; @@ -4269,8 +4269,8 @@ mal_in01,159,225,0 script #CornerLocker10 CLEAR_NPC,{ mes "- You have too many items so you can't continue the quest. -"; close; } - if (checkquest(7268) != -1) { - if (checkquest(7273) == -1) { + if (questprogress(7268)) { + if (!questprogress(7273)) { mes "In the corner of the gap between the wall and locker that is used by cat's gamers,"; mes "I can see something there. It's really hard to find object if drop there."; next; @@ -4300,8 +4300,8 @@ mal_in01,24,72,0 script #FootholdTower11 CLEAR_NPC,{ mes "- You have too many items so you can't continue the quest. -"; close; } - if (checkquest(7268) != -1) { - if (checkquest(7274) == -1) { + if (questprogress(7268)) { + if (!questprogress(7274)) { mes "This cat tower is for playing and resting in Malangdo."; mes "Dust is piled up because there is gap between the foothold and ground."; next; @@ -4485,7 +4485,7 @@ mal_in02,187,58,3 script Chef Nyas 4_CAT_CHEF,{ next; switch(select("What's today's work?:Food Delivery:Just bored...")) { case 1: - if (checkquest(7276,PLAYTIME) == 0) { + if (questprogress(7276,PLAYTIME)) { mes "[Chef Nyas]"; mes "Now, cat's ship biscuit is being baked in this oven."; mes "It's all for your delivery food."; @@ -4506,12 +4506,12 @@ mal_in02,187,58,3 script Chef Nyas 4_CAT_CHEF,{ mes "Just take care of them."; close; } - if (checkquest(7276,PLAYTIME) == 2) + if (questprogress(7276,PLAYTIME) == 2) completequest 7276; mes "[Chef Nyas]"; mes "Here you are."; mes "I need ingredients for cat's ship biscuit now. Fortunately, you are here at the right moment."; - if (checkquest(7276) != -1) + if (questprogress(7276)) erasequest 7276; next; mes "[Chef Nyas]"; @@ -4951,7 +4951,7 @@ malangdo,211,203,4 script [Meow Team] Charo#nya_11 4_CAT_ADV2,{ mes "I'm really disappointed."; mes "Try again~ you can make it!"; set nyadven02,0; - if (checkquest(7257) > -1) + if (questprogress(7257)) erasequest 7257; close; } @@ -5291,7 +5291,7 @@ malangdo,215,201,3 script [Meow Team] Roku#nya_10 4_CAT_DOWN,{ delitem 12636,1; //Malang_Sp_Can getitem 6428,1; //Bravery_Card_A set nyadven02,0; - if (checkquest(7257) > -1) + if (questprogress(7257)) erasequest 7257; close; case 2: @@ -5336,7 +5336,7 @@ malangdo,215,201,3 script [Meow Team] Roku#nya_10 4_CAT_DOWN,{ mes "Do you want to try again?"; mes "I will delete the report of the failed result."; } else { - if (checkquest(7257,PLAYTIME) == 0 || checkquest(7257,PLAYTIME) == 1) { + if (questprogress(7257,PLAYTIME) == 1) { mes "[Roku]"; mes "No, not yet."; mes "Duruduru race is only once for a day."; @@ -5347,7 +5347,7 @@ malangdo,215,201,3 script [Meow Team] Roku#nya_10 4_CAT_DOWN,{ mes "I know that you will try the Duruduru race."; mes "I deleted your last report."; } - if (checkquest(7257) > -1) + if (questprogress(7257)) erasequest 7257; next; mes "[Roku]"; @@ -5616,7 +5616,7 @@ malangdo,175,163,0 script Meowbell#nya_12 CLEAR_NPC,{ viewpoint 2,1,1,3,0xFFFFFF; viewpoint 2,1,1,4,0xFFFFFF; viewpoint 2,1,1,5,0xFFFFFF; - if (checkquest(.@quest,PLAYTIME) == 0 || checkquest(.@quest,PLAYTIME) == 1) { + if (questprogress(.@quest,PLAYTIME) == 1) { mes "Knock Meowbell!!"; set nyadven02,27; changequest .@quest,7257; @@ -6000,7 +6000,7 @@ malangdo,172,178,7 script Cat Detective#nya_14 4_CAT_ADV2,{ next; switch(select("How's the condition of Bang?:Ignore it.")) { case 1: - if (checkquest(7249,PLAYTIME) == 0 || checkquest(7249,PLAYTIME) == 1) { + if (questprogress(7249,PLAYTIME) == 1) { mes "[Homnya]"; mes "it's so motivated but it's not the time yet."; mes "Not yet even though naughty machine is noisy."; @@ -6010,7 +6010,7 @@ malangdo,172,178,7 script Cat Detective#nya_14 4_CAT_ADV2,{ mes "We also have break time....."; close2; } else { - if (checkquest(7249,PLAYTIME) == 2) + if (questprogress(7249,PLAYTIME) == 2) erasequest 7249; mes "[Homnya]"; mes "Can you hear how noisy this one is?"; @@ -6102,7 +6102,7 @@ malangdo,174,175,0 script Noisy Machine#nya_13 CLEAR_NPC,{ mes "It looks more unstable as it spins faster."; close; } - if (checkquest(7249,PLAYTIME) == 0 || checkquest(7249,PLAYTIME) == 1) { + if (questprogress(7249,PLAYTIME) == 1) { mes "[Homnya]"; mes "It's so motivated, but it's not time yet."; mes "Not yet, even though the machine is so noisy."; @@ -6308,7 +6308,7 @@ function script F_Mal_Picture { return 1; else if (nyadven != 10) return 2; - else if (checkquest(getarg(0)) > -1) + else if (questprogress(getarg(0))) return 3; else { mes getarg(2); @@ -6319,7 +6319,7 @@ function script F_Mal_Picture { setquest getarg(0); getitem 6430,1; //Picture_Piece next; - if (checkquest(7251) > -1 && checkquest(7252) > -1 && checkquest(7253) > -1 && checkquest(7254) > -1 && checkquest(7255) > -1 && checkquest(7256) > -1) { + if (questprogress(7251) && questprogress(7252) && questprogress(7253) && questprogress(7254) && questprogress(7255) && questprogress(7256)) { mes "It looks like you can put these pieces of paintings together."; mes "If I found all the pieces, I should go back to Homnya."; set nyadven,11; @@ -6686,7 +6686,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ setquest 5060; close; } else if (malang_gamer == 5) { - if (checkquest(5060,PLAYTIME) == 0 || checkquest(5060,PLAYTIME) == 1) { + if (questprogress(5060,PLAYTIME) == 1) { mes "Cat Gamers Director seems to be in shock. Let's give him some time to calm down."; close; } @@ -6731,7 +6731,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ setquest 5061; close; } else if (malang_gamer == 6) { - if (checkquest(5062) == 2 && checkquest(5063) == 2 && checkquest(5064) == 2 && checkquest(5065) == 2) { + if (questprogress(5062) == 2 && questprogress(5063) == 2 && questprogress(5064) == 2 && questprogress(5065) == 2) { mes "[Cat Gamers Director]"; mes "Heh~ It seems some humans are scamming cats around this town."; next; @@ -6780,7 +6780,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "I appreciate your help, "+strcharinfo(0)+". heh~"; close; } else if (malang_gamer == 7) { - if (checkquest(5060,PLAYTIME) == 0 || checkquest(5060,PLAYTIME) == 1) { + if (questprogress(5060,PLAYTIME) == 1) { mes "Cat Gamers Director seems to be in shock once again. Better give more time to calm down."; close; } @@ -6847,7 +6847,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ setquest 5068; close; } else if (malang_gamer == 10) { - if (checkquest(5068,PLAYTIME) == 0 || checkquest(5068,PLAYTIME) == 1) { + if (questprogress(5068,PLAYTIME) == 1) { mes "[Cat Gamers Director]"; mes "Still receiving petition letters. Heh~"; next; @@ -7019,7 +7019,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ close; } } else if (malang_gamer == 12) { - if (checkquest(5069,PLAYTIME) == 0 || checkquest(5069,PLAYTIME) == 1) { + if (questprogress(5069,PLAYTIME) == 1) { mes "[Cat Gamers Director]"; mes "Heh~ You want to get the '^0000FFCat Gamers Certificate^000000' faster. Heh~ It's not really easy to get such a certificate easily."; next; @@ -7133,10 +7133,10 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ // Detect quest (ID range 5074~5090) mes "[Cat Gamers Director]"; - if (checkquest(5074,HUNTING) > -1) { + if (questprogress(5074,HUNTING)) { mes "Heh~ It's not like I didn't feed them right... Heh~ I hope it was not too much for you, "+strcharinfo(0)+"."; next; - if (checkquest(5074,HUNTING) == 2 && countitem(1023) >= 10) { + if (questprogress(5074,HUNTING) == 2 && countitem(1023) >= 10) { delitem 1023,10; //Fish_Tail callsub L_CompleteQuest,5074, "Heh~ So, you brought 30 Phens and 10 Fish Tails, just as ordered."; @@ -7145,10 +7145,10 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "Heh~ It says in the note to bring 30 Phens and 10 Fish Tails. Heh~ Maybe you didn't catch enough Phens, or forgot some Fish Tails? Heh~"; close; } - } else if (checkquest(5075,HUNTING) > -1) { + } else if (questprogress(5075,HUNTING)) { mes "Heh~ Hmm, 50 Marses, and 30 Milk Bottles... Heh~"; next; - if (checkquest(5075,HUNTING) == 2 && countitem(519) >= 30) { + if (questprogress(5075,HUNTING) == 2 && countitem(519) >= 30) { delitem 519,30; //Milk callsub L_CompleteQuest,5075, "Heh~ Guess they wanted some healthy food. Heh~ They should have just told me... Let me show you my skills. Heh~"; @@ -7157,10 +7157,10 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "Heh~ But, where are 50 Marses and 30 Milk Bottles? Heh~ Please see if you haven't missed them..."; close; } - } else if (checkquest(5076,HUNTING) > -1) { + } else if (questprogress(5076,HUNTING)) { mes "Heh~ Our team must have some grudge over Team 'Dog n Waltz', enough to ask you for this kind of favor..."; next; - if (checkquest(5076,HUNTING) == 2) { + if (questprogress(5076,HUNTING) == 2) { callsub L_CompleteQuest,5076, "Heh~ So you have finished harassing 30 Kobold Archers as noted. Heh~ Outstanding."; } else { @@ -7168,11 +7168,11 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "Heh~ It says on the note, harass 30 Kobold Archers. Heh~ Please check if you have harassed 30 of them already."; close; } - } else if (checkquest(5077,HUNTING) > -1) { + } else if (questprogress(5077,HUNTING)) { mes "Heh~ Ah, quickness training. It's good to see our players trying their best on training."; mes "Heh~ Yes, nothing is better than mouse catching for improving quickness."; next; - if (checkquest(5077,HUNTING) == 2) { + if (questprogress(5077,HUNTING) == 2) { callsub L_CompleteQuest,5077, "Heh~ Oh, you got some fresh and chubby Cramps. Heh~ Great."; } else { @@ -7180,10 +7180,10 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "Heh? Where are those 10 Cramps you promised? Heh~ You didn't eat them... did you?"; close; } - } else if (checkquest(5078,HUNTING) > -1) { + } else if (questprogress(5078,HUNTING)) { mes "Heh~ '50 Peco Peco please!! Let's party.' Hmm... Heh~ 50 Pecos can feed all of our neighbors."; next; - if (checkquest(5078,HUNTING) == 2) { + if (questprogress(5078,HUNTING) == 2) { callsub L_CompleteQuest,5078, "Heh~ Wow, you did bring 50 Peco Pecos. Heh~ I guess we'll really have a party this evening."; } else { @@ -7191,7 +7191,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "Heh~ Where are those Peco Pecos? Still not ready? Heh~"; close; } - } else if (checkquest(5079) > -1) { + } else if (questprogress(5079)) { mes "Heh~ Hmm... let me see... Heh~ That's right, I was worrying about our team getting so nervous before the actual game... But, they won't even talk to me about it."; next; if (countitem(7038) >= 20) { @@ -7203,7 +7203,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "Heh~ Where are those 20 yarns? It says 20 on the note, right...? Please check if you have lost them somewhere."; close; } - } else if (checkquest(5080) > -1) { + } else if (questprogress(5080)) { mes "Heh~ The note says, get me 30 Rat Tails for a snack."; next; if (countitem(1016) >= 30) { @@ -7215,7 +7215,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "Heh~ Where are those 30 Rat Tails? Please check and come back later."; close; } - } else if (checkquest(5081) > -1) { + } else if (questprogress(5081)) { mes "Heh~ It says 5 on the note... 5 of what? What?! Lemons?"; next; if (countitem(568) >= 5) { @@ -7227,7 +7227,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "Heh~ Let's just get 5 Lemons for them, will you? Heh~ I am still not sure where they want to use them..."; close; } - } else if (checkquest(5082) > -1) { + } else if (questprogress(5082)) { mes "Heh~ Give us 10 Ice Pieces or 10 Ice Creams!! Heh~ I personally prefer Ice Cream, just so you know."; next; if (countitem(7066) >= 10) { @@ -7243,10 +7243,10 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "Heh~ Where are the Ice Pieces or Ice Creams? You should get them before they melt..."; close; } - } else if (checkquest(5083) > -1 || checkquest(5084) > -1) { + } else if (questprogress(5083) || questprogress(5084)) { mes "Heh~ Here, I found the note from our team. Heh~"; next; - if (checkquest(5083) > -1) { + if (questprogress(5083)) { mes "[Cat Gamers Director]"; mes "Heh~ It says 'We will meet Eryu together.'. Heh~ Have you met Eryu already? I don't think so... Heh~"; close; @@ -7254,10 +7254,10 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ callsub L_CompleteQuest,5084, "Heh~ Oh, you did meet Eryu. Heh~ I will lecture them later for making you work too much... Heh~"; } - } else if (checkquest(5085) > -1 || checkquest(5086) > -1) { + } else if (questprogress(5085) || questprogress(5086)) { mes "Heh~ Here, I found the note from our team. Heh~"; next; - if (checkquest(5085) > -1) { + if (questprogress(5085)) { mes "[Cat Gamers Director]"; mes "Heh~ It says 'We will meet Stew together.'. Heh~ Have you met Stew already? I don't think so... Heh~"; close; @@ -7265,10 +7265,10 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ callsub L_CompleteQuest,5086, "Heh~ Oh, you did meet Stew. Heh~ I will lecture them later for making you work too much... Heh~"; } - } else if (checkquest(5087) > -1 || checkquest(5088) > -1) { + } else if (questprogress(5087) || questprogress(5088)) { mes "Heh~ Here, I found the note from our team. Heh~"; next; - if (checkquest(5087) > -1) { + if (questprogress(5087)) { mes "[Cat Gamers Director]"; mes "Heh~ It says 'We will meet Ketchup together.'. Heh~ Have you met Ketchup already? I don't think so... Heh~"; close; @@ -7276,10 +7276,10 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ callsub L_CompleteQuest,5088, "Heh~ Oh, you did meet Ketchup. Heh~ I will lecture them later for making you work too much... Heh~"; } - } else if (checkquest(5089) > -1 || checkquest(5090) > -1) { + } else if (questprogress(5089) || questprogress(5090)) { mes "Heh~ Here, I found the note from our team. Heh~"; next; - if (checkquest(5089) > -1) { + if (questprogress(5089)) { mes "[Cat Gamers Director]"; mes "Heh~ It says 'We will meet Eff together.'. Heh~ Have you met Eff already? I don't think so... Heh~"; close; @@ -7606,8 +7606,8 @@ malangdo,161,197,4 script Eryu#gamer 4_CAT,{ mes "Your inventory is too full to proceed. Come back after reducing your load."; close; } - if (checkquest(5061) == 0 || checkquest(5061) == 1) { - if (checkquest(5062) == -1) { + if (questprogress(5061) == 1) { + if (!questprogress(5062)) { mes "You found Eryu the cat, and start talking."; next; mes "[Eryu]"; @@ -7719,7 +7719,7 @@ malangdo,161,197,4 script Eryu#gamer 4_CAT,{ break; } close2; - } else if (checkquest(5062) == 2) { + } else if (questprogress(5062) == 2) { mes "[Eryu]"; mes "Aren't you the magazine writer?"; mes "What brings you here again...?"; @@ -7739,7 +7739,7 @@ malangdo,161,197,4 script Eryu#gamer 4_CAT,{ mes "This is not possible. Please contact an administrator."; close2; } - } else if (checkquest(5083) == 0 || checkquest(5083) == 1) { + } else if (questprogress(5083) == 1) { mes "[Eryu]"; mes "Who are you?"; next; @@ -7763,7 +7763,7 @@ malangdo,161,197,4 script Eryu#gamer 4_CAT,{ mes "Eryu seems to recognize you."; mes .@str$; close2; - } else if (checkquest(5084) == 0 || checkquest(5084) == 1) { + } else if (questprogress(5084) == 1) { mes "[Eryu]"; mes "I think you are the writer..."; mes "Hey~ Stop there~"; @@ -7822,8 +7822,8 @@ malangdo,230,197,4 script Stew#gamer 4_CAT_3COLOR,{ mes "Your inventory is too full to proceed. Come back after reducing your load."; close; } - if (checkquest(5061) == 0 || checkquest(5061) == 1) { - if (checkquest(5063) == -1) { + if (questprogress(5061) == 1) { + if (!questprogress(5063)) { mes "You found Stew the cat, and start talking."; next; mes "[Stew]"; @@ -7948,7 +7948,7 @@ malangdo,230,197,4 script Stew#gamer 4_CAT_3COLOR,{ break; } close2; - } else if (checkquest(5063) == 2) { + } else if (questprogress(5063) == 2) { mes "[Stew]"; mes "Aren't you from the 'Boom Can' Company?"; mes "Another survey meow?"; @@ -7967,7 +7967,7 @@ malangdo,230,197,4 script Stew#gamer 4_CAT_3COLOR,{ mes "This is not possible. Please contact an administrator."; close2; } - } else if (checkquest(5085) == 0 || checkquest(5085) == 1) { + } else if (questprogress(5085) == 1) { mes "[Stew]"; mes "Who are you meow?"; emotion e_what; @@ -7992,7 +7992,7 @@ malangdo,230,197,4 script Stew#gamer 4_CAT_3COLOR,{ mes "Stew seems to recognize you."; mes .@str$; close2; - } else if (checkquest(5086) == 0 || checkquest(5086) == 1) { + } else if (questprogress(5086) == 1) { mes "[Stew]"; mes "I think you are from the 'Boom Can' Company, meow... Who are you, meow~"; next; @@ -8051,8 +8051,8 @@ malangdo,244,144,4 script Ketchup#gamer 4_CAT_SAILOR3,{ mes "Your inventory is too full to proceed. Come back after reducing your load."; close; } - if (checkquest(5061) == 0 || checkquest(5061) == 1) { - if (checkquest(5064) == -1) { + if (questprogress(5061) == 1) { + if (!questprogress(5064)) { mes "You found Ketchup the cat, and start talking."; next; mes "[Ketchup]"; @@ -8136,7 +8136,7 @@ malangdo,244,144,4 script Ketchup#gamer 4_CAT_SAILOR3,{ break; } close2; - } else if (checkquest(5064) == 2) { + } else if (questprogress(5064) == 2) { mes "[Ketchup]"; mes "You are..."; emotion e_omg; @@ -8149,7 +8149,7 @@ malangdo,244,144,4 script Ketchup#gamer 4_CAT_SAILOR3,{ mes "This is not possible. Please contact an administrator."; close2; } - } else if (checkquest(5087) == 0 || checkquest(5087) == 1) { + } else if (questprogress(5087) == 1) { mes "[Ketchup]"; mes "Who are you?"; emotion e_what; @@ -8182,7 +8182,7 @@ malangdo,244,144,4 script Ketchup#gamer 4_CAT_SAILOR3,{ mes "It seems you need to find Ketchup one more time."; close2; } - } else if (checkquest(5088) == 0 || checkquest(5088) == 1) { + } else if (questprogress(5088) == 1) { mes "[Ketchup]"; mes "Can... 'Cans for Kittens'?"; emotion e_omg; @@ -8240,8 +8240,8 @@ malangdo,181,119,7 script Eff#gamer 4_CAT_ADV2,{ mes "Your inventory is too full to proceed. Come back after reducing your load."; close; } - if (checkquest(5061) == 0 || checkquest(5061) == 1) { - if (checkquest(5065) == -1) { + if (questprogress(5061) == 1) { + if (!questprogress(5065)) { mes "You found Eff the cat, and start talking."; next; mes "[Eff]"; @@ -8395,7 +8395,7 @@ malangdo,181,119,7 script Eff#gamer 4_CAT_ADV2,{ break; } close2; - } else if (checkquest(5065) == 2) { + } else if (questprogress(5065) == 2) { mes "[Eff]"; mes "You are--!!"; mes "Meow~ I want to invest. Meow~"; @@ -8417,7 +8417,7 @@ malangdo,181,119,7 script Eff#gamer 4_CAT_ADV2,{ mes "This is not possible. Please contact an administrator."; close2; } - } else if (checkquest(5089) == 0 || checkquest(5089) == 1) { + } else if (questprogress(5089) == 1) { mes "[Eff]"; mes "Who are you, meow?"; next; @@ -8440,7 +8440,7 @@ malangdo,181,119,7 script Eff#gamer 4_CAT_ADV2,{ mes "Eff seems to recognize you."; mes .@str$; close2; - } else if (checkquest(5090) == 0 || checkquest(5090) == 1) { + } else if (questprogress(5090) == 1) { mes "[Eff]"; mes "You are--!!"; mes "Meow~ I want to invest. Meow~"; @@ -8502,7 +8502,7 @@ mal_in01,91,216,4 script Ser#gamer 4_CAT_SAILOR1,{ close; } for(set .@i,5074; .@i<=5090; set .@i,.@i+1) { - if (checkquest(.@i) > -1) { + if (questprogress(.@i)) { mes "[Ser]"; mes "Hey, ^0000FF"+strcharinfo(0)+"^000000. You haven't done what we asked you for. A promise is a promise, you know."; next; @@ -8535,11 +8535,11 @@ mal_in01,91,216,4 script Ser#gamer 4_CAT_SAILOR1,{ mes "Please go get the certificate."; close; } - if (checkquest(5070,PLAYTIME) == 0 || checkquest(5070,PLAYTIME) == 1) { + if (questprogress(5070,PLAYTIME) == 1) { mes "[Ser]"; mes "Is it tomorrow already? I don't think so! Can't you read the time?"; close; - } else if (checkquest(5070,PLAYTIME) == 2) + } else if (questprogress(5070,PLAYTIME) == 2) erasequest 5070; mes "[Ser]"; mes "Oh, ^0000FF"+strcharinfo(0)+"^000000? Want to play the Rock Paper Scissors game?"; @@ -8846,7 +8846,7 @@ mal_in01,86,222,4 script Paa#gamer 4_CAT_SAILOR1,{ close; } for(set .@i,5074; .@i<=5090; set .@i,.@i+1) { - if (checkquest(.@i) > -1) { + if (questprogress(.@i)) { mes "[Paa]"; mes "You haven't done what we asked you for meow. A promise is a promise, you know meow."; next; @@ -8879,11 +8879,11 @@ mal_in01,86,222,4 script Paa#gamer 4_CAT_SAILOR1,{ mes "Go get the certificate meow."; close; } - if (checkquest(5070,PLAYTIME) == 0 || checkquest(5070,PLAYTIME) == 1) { + if (questprogress(5070,PLAYTIME) == 1) { mes "[Paa]"; mes "We can only play the game once a day meow. Come tomorrow meow."; close; - } else if (checkquest(5070,PLAYTIME) == 2) + } else if (questprogress(5070,PLAYTIME) == 2) erasequest 5070; mes "[Paa]"; mes "Oh, ^0000FF"+strcharinfo(0)+"^000000 meow? Want to play the Rock Paper Scissors game meow?"; @@ -9176,7 +9176,7 @@ mal_in01,91,222,4 script Kuka#gamer 4_M_BABYCAT,{ close; } for(set .@i,5074; .@i<=5090; set .@i,.@i+1) { - if (checkquest(.@i) > -1) { + if (questprogress(.@i)) { mes "[Kuka]"; mes "You haven't done what we asked you for yo~. A promise is a promise, you know yo~."; next; @@ -9209,11 +9209,11 @@ mal_in01,91,222,4 script Kuka#gamer 4_M_BABYCAT,{ mes "Please go get the certificate yo~"; close; } - if (checkquest(5071,PLAYTIME) == 0 || checkquest(5071,PLAYTIME) == 1) { + if (questprogress(5071,PLAYTIME) == 1) { mes "[Kuka]"; mes "Is it not tomorrow yet yo~ You can play one game a day yo~ Come back tomorrow yo~"; close; - } else if (checkquest(5071,PLAYTIME) == 2) + } else if (questprogress(5071,PLAYTIME) == 2) erasequest 5071; mes "[Kuka]"; mes "Oh great member you, ^0000FF"+strcharinfo(0)+"^000000~ Let's play ChamChamCham yo~"; @@ -9498,7 +9498,7 @@ mal_in01,134,221,4 script KungKung#gamer 4_M_BABYCAT,{ close; } for(set .@i,5074; .@i<=5090; set .@i,.@i+1) { - if (checkquest(.@i) > -1) { + if (questprogress(.@i)) { mes "[KungKung]"; mes "You didn't keep your promise. I have no business with you."; close; @@ -9525,11 +9525,11 @@ mal_in01,134,221,4 script KungKung#gamer 4_M_BABYCAT,{ mes "Where is your certificate? You cannot practice with us unless you have that certificate. Go get it."; close; } - if (checkquest(5072,PLAYTIME) == 0 || checkquest(5072,PLAYTIME) == 1) { + if (questprogress(5072,PLAYTIME) == 1) { mes "[KungKung]"; mes "You don't have a watch? Or can't read the time? It's not the time yet."; close; - } else if (checkquest(5072,PLAYTIME) == 2) + } else if (questprogress(5072,PLAYTIME) == 2) erasequest 5072; mes "[KungKung]"; mes "Are you the practice partner? You are late. Let's start right away."; @@ -9916,7 +9916,7 @@ mal_in01,133,214,6 script Leader#gamer 4_CAT_SAILOR3,{ close; } for(set .@i,5074; .@i<=5090; set .@i,.@i+1) { - if (checkquest(.@i) > -1) { + if (questprogress(.@i)) { mes "[Leader]"; mes "You cannot challenge this Flag Game unless you are done with your assigned work."; close; @@ -9943,11 +9943,11 @@ mal_in01,133,214,6 script Leader#gamer 4_CAT_SAILOR3,{ mes "You cannot challenge this Flag Game unless you are wearing our certificate item. Please come back later."; close; } - if (checkquest(5073) == 0 || checkquest(5073) == 1) { + if (questprogress(5073) == 1) { mes "[Leader]"; mes "The Flag Game is only available once a day."; close; - } else if (checkquest(5073) == 2) + } else if (questprogress(5073) == 2) erasequest 5073; mes "[Leader]"; mes "Do you want to challege?"; @@ -10446,8 +10446,8 @@ mal_in01,142,220,6 script Sign#Cat G B2 4_BULLETIN_BOARD2,{ } mal_in01,155,222,2 script Uneet#gamer 4_LAM,{ - set .@playtime, checkquest(5069,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(5069,PLAYTIME); + if (.@playtime == 1) { mes "[Uneet]"; mes "Wow Wot~ What a busy day~"; mes "Oh, you are the one who won the honorable certificate?"; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index 617ccf2c7..c64dd5230 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -70,8 +70,8 @@ malaya,266,76,3 script Rodel the Guard#malaya 4_MAL_SOLDIER,4,4,{ mes "I was thinking of giving you the extermination mission that's being carried out in the city. What a shame. "; close; } - .@playtime = checkquest(7405, PLAYTIME); - if (.@playtime == 0) { + .@playtime = questprogress(7405, PLAYTIME); + if (!.@playtime) { mes "[Rodel the Guard]"; mes "Whew, thanks to you, I have one less thing to worry about."; mes "I will lose less of my things."; @@ -93,8 +93,8 @@ malaya,266,76,3 script Rodel the Guard#malaya 4_MAL_SOLDIER,4,4,{ mes "Come and find me when you decide."; close; } else { - .@hunting = checkquest(7404, HUNTING); - if (.@hunting == -1) { + .@hunting = questprogress(7404, HUNTING); + if (!.@hunting) { mes "[Rodel the Guard]"; switch(rand(1, 6)) { case 1: @@ -133,7 +133,7 @@ malaya,266,76,3 script Rodel the Guard#malaya 4_MAL_SOLDIER,4,4,{ mes "It would be a simple task for you."; setquest 7404; close; - } else if (.@hunting == 0) { + } else if (.@hunting == 0) { // FIXME mes "[Rodel the Guard]"; mes "You have to get rid of 20 Jejelings."; mes "20 should be enough to give those Jejelings a good scare."; @@ -259,7 +259,7 @@ malaya,185,358,3 script Leader Phong in Mumbaki 4_BARYO_CHIEF,{ mes "Young friend. Your presence is welcomed anywhere."; mes "The light from your pure soul will protect you from the darkness."; set malaya_hi, 10; - if (checkquest(7350) > -1) + if (questprogress(7350)) erasequest 7350; close; } else if (malaya_hi == 10) { @@ -487,7 +487,7 @@ malaya,185,358,3 script Leader Phong in Mumbaki 4_BARYO_CHIEF,{ close; } case 2: - if (checkquest(7402) == -1) { + if (!questprogress(7402)) { mes "[Phong in Mumbaki]"; mes "Who is the floral tribute for?"; mes "Don't tell me you're making one in advance cause you're lazy?"; @@ -643,8 +643,8 @@ malaya,169,350,5 script Imelda#malaya 4_M_BRZ_JACI,{ setquest 7367; close; } else if (malaya_hi == 22) { - .@playtime = checkquest(7367, PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7367, PLAYTIME); + if (.@playtime == 1) { mes "Imelda is in ritual with a devout aura, compared to when she streamed invectives."; mes "Better not disturb her."; close; @@ -720,7 +720,7 @@ malaya,169,350,5 script Imelda#malaya 4_M_BRZ_JACI,{ next; switch (select("I'll help you making Spiritual Protections.:Love and Spiritual Protection for all.")) { case 1: - if (checkquest(7380) > -1) { + if (questprogress(7380)) { if ((countitem(6501) < 6) || (countitem(6502) < 6) || (countitem(6500) < 6)) { mes "[Imelda]"; mes "Materials for making a Spiritual Protection are"; @@ -749,8 +749,8 @@ malaya,169,350,5 script Imelda#malaya 4_M_BRZ_JACI,{ getexp 200000,200000; close; } else { - .@playtime = checkquest(7381, PLAYTIME); - if ((.@playtime == 0) || (.@playtime == 1)) { + .@playtime = questprogress(7381, PLAYTIME); + if (.@playtime == 1) { mes "[Imelda]"; mes "I appreciate your kindness, but we have enough for today."; mes "I'll ask for you when I need more materials."; @@ -789,8 +789,8 @@ malaya,169,350,5 script Imelda#malaya 4_M_BRZ_JACI,{ } } case 2: - if (checkquest(7374) != -1) { - if (checkquest(7379) == -1) { + if (questprogress(7374)) { + if (!questprogress(7379)) { mes "[Imelda]"; mes "Please deliver these new Spiritual Protections to the villagers."; mes "You know them, right?"; @@ -819,8 +819,8 @@ malaya,169,350,5 script Imelda#malaya 4_M_BRZ_JACI,{ $malayaNames$[0] = strcharinfo(0); close; } else { - .@playtime = checkquest(7375, PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7375, PLAYTIME); + if (.@playtime == 1) { mes "[Imelda]"; mes "The Spiritual Protections given before will still be in effect"; mes "It's okay for now."; @@ -838,7 +838,7 @@ malaya,169,350,5 script Imelda#malaya 4_M_BRZ_JACI,{ mes "Of course, you'll still encounter ghosts here and there."; close; } - if ((checkquest(7381) == 0) || (checkquest(7381) == 1)) { + if (questprogress(7381) == 1) { mes "[Imelda]"; mes "Thank you very much."; mes "Come back when you've given them all out."; @@ -873,7 +873,7 @@ malaya,169,350,5 script Imelda#malaya 4_M_BRZ_JACI,{ mes "Of course, you'll still encounter ghosts here and there."; close; } - if ((checkquest(7381, PLAYTIME) == 0) || (checkquest(7381, PLAYTIME) == 1)) { + if (questprogress(7381, PLAYTIME) == 1) { mes "[Imelda]"; mes "Thank you very much."; mes "Come back when you've given them all out."; @@ -912,7 +912,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ mes "Not from around here, I see. I have nothing to say."; close; } else if (malaya_hi == 10) { - if (checkquest(7353) == 2) { + if (questprogress(7353) == 2) { mes "[Old Man Nardo]"; mes "How about lending a hand for a poor old man?"; mes "I don't care if it's just a sleeve of your shirt, just give me something with your vigor."; @@ -937,7 +937,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ mes "-The troubled villagers desire your belongings because you fend off the ghosts. -"; setquest 7353; completequest 7353; - if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) { + if (questprogress(7352) + questprogress(7353) + questprogress(7354) + questprogress(7355) + questprogress(7356) + questprogress(7357) > 9) { next; mes "-So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki.-"; set malaya_hi, 11; @@ -951,7 +951,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ mes "Must counsel with Mumbaki first!"; close; } else if (malaya_hi == 12) { - if (checkquest(7360) != -1) { + if (questprogress(7360)) { mes "[Old Man Nardo]"; mes "To be honest, I do not believe that this Holy Artifact has any abilities."; mes "It's just for the peace of mind."; @@ -980,7 +980,8 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ delitem 523, 1; //Holy_Water setquest 7360; completequest 7360; - if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) { + if (questprogress(7359) == 2 && questprogress(7360) == 2 && questprogress(7361) == 2 + && questprogress(7362) == 2 && questprogress(7363) == 2 && questprogress(7364) == 2) { mes "-With the Old Man as last, enough Holy Artifacts have been given out.-"; set malaya_hi, 13; erasequest 7351; @@ -1032,7 +1033,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ mes "Thank you."; close; case 2: - if ((checkquest(7374) != -1) && (checkquest(7369) != -1)) { + if (questprogress(7374) && questprogress(7369)) { if (!countitem(6503)) { mes "^4d4dffThere's no Spiritual Protection to give to the Old Man.^000000"; close; @@ -1046,7 +1047,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ delitem 6503, 1; // Soul_Protection erasequest 7369; setquest 7383; - if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) { + if (questprogress(7382) + questprogress(7383) + questprogress(7384) + questprogress(7385) + questprogress(7386) + questprogress(7387) > 5) { mes "- With the Old Man as last, all Spiritual Protections have been delivered. Head back to Imelda.-"; if (malaya_hi == 23) { set malaya_hi, 24; @@ -1075,7 +1076,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ mes "I'm sorry but I can't let you carry the precious Cast Iron Cauldron."; close; } - if ((checkquest(7378, PLAYTIME) == 0) || (checkquest(7378, PLAYTIME) == 1)) { + if (questprogress(7378, PLAYTIME) == 1) { mes "[Old Man Nardo]"; mes "You've delivered the Cast Iron Cauldron to Baryo, so that's enough for today."; mes "No matter how strong a cauldron is, even with the toughest cast iron, it only lasts a day."; @@ -1083,7 +1084,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ mes "[Old Man Nardo]"; mes "Help me out again tomorrow if you can."; close; - } else if (checkquest(7378, PLAYTIME) == 2) { + } else if (questprogress(7378, PLAYTIME) == 2) { mes "[Old Man Nardo]"; mes "Hey there!"; mes "So, are you well and well fed?"; @@ -1094,7 +1095,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ erasequest 7378; close; } else { - if (checkquest(7377) != -1) { + if (questprogress(7377)) { if (countitem(6503) < 5) { mes "[Old Man Nardo]"; mes "Did you deliver the cauldron in one piece?"; @@ -1121,7 +1122,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ $malayaNames$[2] = strcharinfo(0); close; } else { - if (checkquest(7376) > -1) { + if (questprogress(7376)) { mes "[Old Man Nardo]"; mes "Go to Kiko in Mumbaki at Baryo Mahiwaga and deliver the Cast Iron Cauldron."; mes "This should help against the Bakonawa troubles."; @@ -1176,7 +1177,7 @@ malaya,224,267,3 script Romel#malaya 4_M_MAYOR,{ mes "(He evades your gaze and ignores you.)"; close; } else if (malaya_hi == 10) { - if (checkquest(7357) == 2) { + if (questprogress(7357) == 2) { mes "[Romel]"; mes "....So cold-hearted."; mes "And here we are, always trembling in anxiety..."; @@ -1201,7 +1202,7 @@ malaya,224,267,3 script Romel#malaya 4_M_MAYOR,{ mes "-The troubled villagers desire your belongings because you fend off the ghosts. -"; setquest 7357; completequest 7357; - if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) { + if (questprogress(7352) + questprogress(7353) + questprogress(7354) + questprogress(7355) + questprogress(7356) + questprogress(7357) > 9) { next; mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki.-"; set malaya_hi, 11; @@ -1214,7 +1215,7 @@ malaya,224,267,3 script Romel#malaya 4_M_MAYOR,{ mes "He'll surely take a hair or pull a sleeve if he had his way!"; close; } else if (malaya_hi == 12) { - if (checkquest(7364) != -1) { + if (questprogress(7364)) { mes "[Romel]"; mes "Frankly speaking, it's for the peace of mind."; mes "With it, I could face them with more boldness."; @@ -1245,7 +1246,8 @@ malaya,224,267,3 script Romel#malaya 4_M_MAYOR,{ delitem 523, 1; //Holy_Water setquest 7364; completequest 7364; - if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) { + if (questprogress(7359) == 2 && questprogress(7360) == 2 && questprogress(7361) == 2 + && questprogress(7362) == 2 && questprogress(7363) == 2 && questprogress(7364) == 2) { mes "-With Romel as last, I think enough Holy Artifacts have been given.-"; set malaya_hi, 13; erasequest 7351; @@ -1286,7 +1288,7 @@ malaya,224,267,3 script Romel#malaya 4_M_MAYOR,{ mes "I am at peace these days."; close; } - if ((checkquest(7374) == -1) || (checkquest(7373) == -1)) { + if (!questprogress(7374) || !questprogress(7373)) { mes "[Romel]"; mes "A new Spiritual Protection?"; mes "The one you gave me before still works fine."; @@ -1306,7 +1308,7 @@ malaya,224,267,3 script Romel#malaya 4_M_MAYOR,{ delitem 6503, 1; // Soul_Protection erasequest 7373; setquest 7387; - if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) { + if (questprogress(7382) + questprogress(7383) + questprogress(7384) + questprogress(7385) + questprogress(7386) + questprogress(7387) > 5) { mes "- With Romel as last, all Spiritual Protections have been delivered. Head back to Imelda.-"; if (malaya_hi == 23) { set malaya_hi, 24; @@ -1332,7 +1334,7 @@ malaya,223,267,5 script Talah#malaya 4_F_DST_CHILD,{ mes "(When your eyes met with hers, she ran and hid behind her father.)"; close; } else if (malaya_hi == 10) { - if (checkquest(7356) == 2) { + if (questprogress(7356) == 2) { mes "[Talah]"; mes "Talah might be taken away tonight."; mes "Scary kids might come to Talah."; @@ -1355,7 +1357,7 @@ malaya,223,267,5 script Talah#malaya 4_F_DST_CHILD,{ mes "- The troubled villagers desire your belongings because you fend off the ghosts. -"; setquest 7356; completequest 7356; - if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) { + if (questprogress(7352) + questprogress(7353) + questprogress(7354) + questprogress(7355) + questprogress(7356) + questprogress(7357) > 9) { next; mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki. -"; set malaya_hi, 11; @@ -1367,7 +1369,7 @@ malaya,223,267,5 script Talah#malaya 4_F_DST_CHILD,{ mes "Talah looks from you to her father with inquisitive eyes."; close; } else if (malaya_hi == 12) { - if (checkquest(7363) != -1) { + if (questprogress(7363)) { mes "[Talah]"; mes "I dont know for sure"; mes "but I get a warm feel from them."; @@ -1393,7 +1395,8 @@ malaya,223,267,5 script Talah#malaya 4_F_DST_CHILD,{ delitem 523, 1; //Holy_Water setquest 7363; completequest 7363; - if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) { + if (questprogress(7359) == 2 && questprogress(7360) == 2 && questprogress(7361) == 2 + && questprogress(7362) == 2 && questprogress(7363) == 2 && questprogress(7364) == 2) { mes "-With Talah as last, I think enough Holy Artifacts have been given.-"; set malaya_hi, 13; erasequest 7351; @@ -1415,7 +1418,7 @@ malaya,223,267,5 script Talah#malaya 4_F_DST_CHILD,{ mes "You're keeping us safe aren't you?"; close; } - if ((checkquest(7374) != -1) && (checkquest(7372) != -1)) { + if (questprogress(7374) && questprogress(7372)) { if (!countitem(6503)) { mes "^4d4dffThere is no Spiritual Protection to give to Talah.^000000"; close; @@ -1430,7 +1433,7 @@ malaya,223,267,5 script Talah#malaya 4_F_DST_CHILD,{ delitem 6503, 1; // Soul_Protection erasequest 7372; setquest 7386; - if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) { + if (questprogress(7382) + questprogress(7383) + questprogress(7384) + questprogress(7385) + questprogress(7386) + questprogress(7387) > 5) { mes "- With Talah as last, all Spiritual Protections have been delivered. Head back to Imelda. -"; if (malaya_hi == 23) { set malaya_hi, 24; @@ -1460,7 +1463,7 @@ malaya,62,274,0 script Sand Trap#malaya 4_SOIL,{ mes "- Cannot proceed with the quest. You are carrying too many items. -"; close; } - if ((checkquest(7366) == -1) && (checkquest(7380) == -1)) { + if (!questprogress(7366) && !questprogress(7380)) { mes "A device to evaporate sea water is buried in the sand..."; close; } @@ -1494,7 +1497,7 @@ ma_fild01,178,206,0 script Black Bamboo#malaya CLEAR_NPC,4,4,{ mes "- Cannot proceed with the quest. You are carrying too many items. -"; close; } - if ((checkquest(7366) == -1) && (checkquest(7380) == -1)) { + if (!questprogress(7366) && !questprogress(7380)) { mes "There's a short and black bamboo tree."; close; } @@ -1513,7 +1516,7 @@ ma_fild01,178,206,0 script Black Bamboo#malaya CLEAR_NPC,4,4,{ mes "I knew I could do this!"; close; OnTouch: - if ((checkquest(7366) != -1) || (checkquest(7380) != -1)) { + if (questprogress(7366) || questprogress(7380)) { specialeffect EF_LEVEL99_4; } end; @@ -1540,7 +1543,7 @@ malaya,295,171,3 script Collection Dealer Woeon 4_M_MALAYA,{ mes "Go away. Shoo, leave!"; close; } else if (malaya_hi == 10) { - if (checkquest(7355) == 2) { + if (questprogress(7355) == 2) { mes "[Woeon]"; mes "Now, look here my friend..."; mes "This can all be solved by giving me a button."; @@ -1564,7 +1567,7 @@ malaya,295,171,3 script Collection Dealer Woeon 4_M_MALAYA,{ mes "- The troubled villagers desire your belongings because you fend off the ghosts. -"; setquest 7355; completequest 7355; - if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) { + if (questprogress(7352) + questprogress(7353) + questprogress(7354) + questprogress(7355) + questprogress(7356) + questprogress(7357) > 9) { next; mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki.-"; set malaya_hi, 11; @@ -1584,7 +1587,7 @@ malaya,295,171,3 script Collection Dealer Woeon 4_M_MALAYA,{ mes "Cold hearted son of a..."; close; } else if (malaya_hi == 12) { - if (checkquest(7362) != -1) { + if (questprogress(7362)) { mes "[Woeon]"; mes "Hmm. Look at my hands."; mes "Less shaky, eh?"; @@ -1618,7 +1621,8 @@ malaya,295,171,3 script Collection Dealer Woeon 4_M_MALAYA,{ delitem 523, 1; //Holy_Water setquest 7362; completequest 7362; - if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) { + if (questprogress(7359) == 2 && questprogress(7360) == 2 && questprogress(7361) == 2 + && questprogress(7362) == 2 && questprogress(7363) == 2 && questprogress(7364) == 2) { mes "-With Woeon as last, I think enough Holy Artifacts have been given.-"; set malaya_hi, 13; erasequest 7351; @@ -1636,7 +1640,7 @@ malaya,295,171,3 script Collection Dealer Woeon 4_M_MALAYA,{ mes "Oh, hi there!"; next; if (select("Give Spiritual Protection.:The Dealer and his Collection") == 1) { - if (((checkquest(7374) == 0) || (checkquest(7374) == 1)) && ((checkquest(7371) == 0) || (checkquest(7371) == 1))) { + if (questprogress(7374) == 1 && questprogress(7371) == 1) { if (!countitem(6503)) { mes "^4d4dffThere is no Spiritual Protection to give to Woeon.^000000"; close; @@ -1650,7 +1654,7 @@ malaya,295,171,3 script Collection Dealer Woeon 4_M_MALAYA,{ delitem 6503, 1; // Soul_Protection erasequest 7371; setquest 7385; - if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) { + if (questprogress(7382) + questprogress(7383) + questprogress(7384) + questprogress(7385) + questprogress(7386) + questprogress(7387) > 5) { mes "-With Woeon as last, all Spiritual Protections have been delivered.-"; if (malaya_hi == 23) { set malaya_hi, 24; @@ -1683,13 +1687,13 @@ malaya,295,171,3 script Collection Dealer Woeon 4_M_MALAYA,{ mes "I'll let you have at it once you're stronger, my friend!"; close; } - if ((checkquest(7392, PLAYTIME) == 0) || (checkquest(7392, PLAYTIME) == 1)) { + if (questprogress(7392, PLAYTIME) == 1) { mes "[Woeon]"; mes "Oh, the Jejellopy collecting?"; mes "I have enough for today."; mes "Come back again tomorrow."; close; - } else if (checkquest(7392, PLAYTIME) == 2) { + } else if (questprogress(7392, PLAYTIME) == 2) { mes "[Woeon]"; mes "Oh, yes yes."; mes "You're going to collect Jejellopy today as well?"; @@ -1708,7 +1712,7 @@ malaya,295,171,3 script Collection Dealer Woeon 4_M_MALAYA,{ setquest 7391; close; } else { - if ((checkquest(7391) == 0) || (checkquest(7391) == 1)) { + if (questprogress(7391) == 1) { if (countitem(6498) < 30) { mes "[Woeon]"; mes "Hmm? I don't think you have enough."; @@ -1777,7 +1781,7 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ mes "Go... Go away!"; close; } else if (malaya_hi == 10) { - if (checkquest(7354) == 2) { + if (questprogress(7354) == 2) { mes "[Pandoi]"; mes "Please.."; mes "Couldn't you help a guy out here, just for the sake of it?"; @@ -1806,7 +1810,7 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ mes "-The troubled villagers desire your belongings because you fend off the ghosts. -"; setquest 7354; completequest 7354; - if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) { + if (questprogress(7352) + questprogress(7353) + questprogress(7354) + questprogress(7355) + questprogress(7356) + questprogress(7357) > 9) { next; mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki.-"; set malaya_hi, 11; @@ -1826,7 +1830,7 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ mes "Do you really think ignoring me is the best option?!"; close; } else if (malaya_hi == 12) { - if (checkquest(7361) != -1) { + if (questprogress(7361)) { mes "[Pandoi]"; mes "Now that I have confidence, the only thing left for me to do is charge to the hospital or field for material!"; mes "Bu... But, I'm too scared..."; @@ -1850,7 +1854,8 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ delitem 523, 1; //Holy_Water setquest 7361; completequest 7361; - if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) { + if (questprogress(7359) == 2 && questprogress(7360) == 2 && questprogress(7361) == 2 + && questprogress(7362) == 2 && questprogress(7363) == 2 && questprogress(7364) == 2) { mes "-With Pandoi as last, I think I've given enough Holy Artifacts.-"; set malaya_hi, 13; erasequest 7351; @@ -1887,7 +1892,7 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ next; switch (select("Give Spiritual Protection.:Silver Blade.:Silver Cross")) { case 1: - if ((checkquest(7374) == -1) || (checkquest(7370) == -1)) { + if (!questprogress(7374) || !questprogress(7370)) { mes "[Pandoi]"; mes "I appreciate you taking care of the expiration dates of my Spiritual Protection."; mes "I think mine's good for now. "; @@ -1906,7 +1911,7 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ delitem 6503, 1; // Soul_Protection erasequest 7370; setquest 7384; - if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) { + if (questprogress(7382) + questprogress(7383) + questprogress(7384) + questprogress(7385) + questprogress(7386) + questprogress(7387) > 5) { mes "-With Pandoi as last, all Spiritual Protections have been delivered.-"; if (malaya_hi == 23) { set malaya_hi, 24; @@ -1932,7 +1937,7 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ mes "If you go in there like that... You'll never make it out alive!"; close; } - .@hunting = checkquest(7393, HUNTING); + .@hunting = questprogress(7393, HUNTING); if (.@hunting == 2) { if (countitem(6508) < 10) { mes "[Pandoi]"; @@ -1968,7 +1973,7 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ if (!rand(3)) $malayaNames$[1] = strcharinfo(0); close; - } else if (.@hunting == 0 || .@hunting == 1) { + } else if (.@hunting == 1) { mes "[Pandoi]"; mes "The village hospital holds the most hideous things inside."; mes "I'm not sure what exactly... Whatever's in there, I'm not willing to go near it..."; @@ -1978,8 +1983,8 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ mes "You're the only one I can trust!"; close; } else { - .@playtime = checkquest(7394, PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7394, PLAYTIME); + if (.@playtime == 1) { mes "[Pandoi]"; mes "I still have some silver to smelt."; mes "I'll request more if I fail again."; @@ -2125,7 +2130,7 @@ malaya,326,68,2 script Pedro the Sailor 4W_SAILOR,{ mes "I'm seeing ghosts. I think it's my time to die."; close; } else if (malaya_hi == 10) { - if (checkquest(7352) == 2) { + if (questprogress(7352) == 2) { mes "- Pedro the Sailor seems to have given up, but he can't take his gaze off of me.-"; close; } @@ -2168,7 +2173,7 @@ malaya,326,68,2 script Pedro the Sailor 4W_SAILOR,{ mes "- Pedro the Sailor seems to have given up, but he can't take his gaze off of me.-"; setquest 7352; completequest 7352; - if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) { + if (questprogress(7352) + questprogress(7353) + questprogress(7354) + questprogress(7355) + questprogress(7356) + questprogress(7357) > 9) { next; mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki. -"; set malaya_hi, 11; @@ -2181,7 +2186,7 @@ malaya,326,68,2 script Pedro the Sailor 4W_SAILOR,{ mes "This is so awkward."; close; } else if (malaya_hi == 12) { - if (checkquest(7359) != -1) { + if (questprogress(7359)) { mes "[Pedro the Sailor]"; mes "Anyway, now that I have what they hate..."; mes "Now's the time to charge into my ship...!"; @@ -2208,7 +2213,8 @@ malaya,326,68,2 script Pedro the Sailor 4W_SAILOR,{ delitem 523, 1; //Holy_Water setquest 7359; completequest 7359; - if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) { + if (questprogress(7359) == 2 && questprogress(7360) == 2 && questprogress(7361) == 2 + && questprogress(7362) == 2 && questprogress(7363) == 2 && questprogress(7364) == 2) { mes "-With Pedro the Sailor as last, I think I gave enough Holy Artifacts.-"; set malaya_hi, 13; erasequest 7351; @@ -2229,7 +2235,7 @@ malaya,326,68,2 script Pedro the Sailor 4W_SAILOR,{ mes "Well, living the dream, eh?"; next; if (select("Give Spiritual Protection.:About the Ferry Ride") == 1) { - if ((checkquest(7374) == -1) || (checkquest(7368) == -1)) { + if (!questprogress(7374) || !questprogress(7368)) { mes "[Pedro the Sailor]"; mes "The Spiritual Protection you gave me before works fine."; mes "I'm good for now."; @@ -2248,7 +2254,7 @@ malaya,326,68,2 script Pedro the Sailor 4W_SAILOR,{ delitem 6503, 1; // Soul_Protection erasequest 7368; setquest 7382; - if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) { + if (questprogress(7382) + questprogress(7383) + questprogress(7384) + questprogress(7385) + questprogress(7386) + questprogress(7387) > 5) { mes "-With Pedro the Sailor as last, all Spiritual Protections have been delivered.-"; if (malaya_hi == 23) { set malaya_hi, 24; @@ -2381,8 +2387,8 @@ malaya,326,68,2 script Pedro the Sailor 4W_SAILOR,{ $malayaNames$[0] = strcharinfo(0); close; } else { - .@playtime = checkquest(7401, PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7401, PLAYTIME); + if (.@playtime == 1) { mes "[Pedro the Sailor]"; mes "If you want to go to Alberta, use the big ship over there."; mes "This little one goes to Izlude."; @@ -2412,8 +2418,8 @@ malaya,326,68,2 script Pedro the Sailor 4W_SAILOR,{ erasequest 7401; goto L_SetQuest; } else { - if (checkquest(7403) == -1) { - if (checkquest(7402) == -1) { + if (!questprogress(7403)) { + if (!questprogress(7402)) { goto L_SetQuest; } mes "[Pedro the Sailor]"; @@ -2630,9 +2636,9 @@ OnTouch: mes "If they bother me again, however, I won't be."; close; } else { - if (checkquest(7402) == -1) { - if (checkquest(7403) == -1) { - if ((checkquest(7401, PLAYTIME) == 0) || (checkquest(7401, PLAYTIME) == 1)) { + if (!questprogress(7402)) { + if (!questprogress(7403)) { + if (questprogress(7401, PLAYTIME) == 1) { cutin "malaya_diwata02", 2; mes "[Diwata]"; mes "Surprisingly enough, I'm doing fine."; @@ -2733,8 +2739,8 @@ ma_fild01,261,208,2 script Kiko in Mumbaki 4_BARYO_CHIEF,{ next; switch (select("Give Cast-Iron Caldron.:Request Purification Ritual.:Exchange Jellopy for gold.")) { case 1: - if (checkquest(7376) == -1) { - if (checkquest(7377) == -1) { + if (!questprogress(7376)) { + if (!questprogress(7377)) { mes "[Kiko in Mumbaki]"; mes "What cauldron?"; mes "As far as I know, you're not the one bringing it."; @@ -2779,8 +2785,8 @@ ma_fild01,261,208,2 script Kiko in Mumbaki 4_BARYO_CHIEF,{ erasequest 7376; close; case 2: - if (checkquest(7406) == -1) { - if (checkquest(7407) == -1) { + if (!questprogress(7406)) { + if (!questprogress(7407)) { mes "[Kiko in Mumbaki]"; mes "The only purification needed in this village is Vantai's food."; mes "There are no rituals where an outsider, like yourself, can take part in."; @@ -2861,8 +2867,8 @@ ma_fild01,239,253,3 script Dhong the Guard 4_MAL_SOLDIER,{ mes "Ha ha ha ha ha ha ha!"; close; } - .@playtime = checkquest(7408, PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7408, PLAYTIME); + if (.@playtime == 1) { mes "[Dhong the Guard]"; mes "The bones you brought Vantai gave him a feast."; mes "He'll be full and merry for a while now."; @@ -2889,7 +2895,7 @@ ma_fild01,239,253,3 script Dhong the Guard 4_MAL_SOLDIER,{ mes "for the hero to get us some Evil Spirit Bones from the forest."; close; } else { - if (checkquest(7406) != -1) { + if (questprogress(7406)) { mes "[Dhong the Guard]"; mes "What I'm saying is that, to be a good guard dog, he must be able to stand ground against evil spirits."; mes "For that he needs to eat Evil Spirit Bones, but it must be purified before he can eat them."; @@ -2899,7 +2905,7 @@ ma_fild01,239,253,3 script Dhong the Guard 4_MAL_SOLDIER,{ mes "Kiko in Mumbaki will purify them for you."; close; } else { - if (checkquest(7407) == 1) { + if (questprogress(7407) == 1) { if (countitem(6505) < 10) { mes "[Dhong the Guard]"; mes "Kiko in Mumbaki asked for 10 Purified Spirit Bones."; @@ -2995,8 +3001,8 @@ ma_fild01,200,190,3 script Maries#malaya 4_F_BARYO_WOMAN,{ mes "An anxious looking woman is stands."; close; } - .@playtime = checkquest(7390, PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7390, PLAYTIME); + if (.@playtime == 1) { mes "[Maries]"; mes "Now that the children know that they can get back home with an Inside-out Shirt,"; mes "they play out in the forest recklessly and timelessly."; @@ -3012,7 +3018,7 @@ ma_fild01,200,190,3 script Maries#malaya 4_F_BARYO_WOMAN,{ erasequest 7390; close; } else { - if (checkquest(7389) != -1) { + if (questprogress(7389)) { mes "[Maries]"; mes "You came back."; mes "Thanks to you, the child has returned home safely."; @@ -3031,7 +3037,7 @@ ma_fild01,200,190,3 script Maries#malaya 4_F_BARYO_WOMAN,{ $malayaNames$[2] = strcharinfo(0); close; } else { - if (checkquest(7388) != -1) { + if (questprogress(7388)) { mes "[Maries]"; mes "I'm sure they're lost in the woods because of mischievous spirits."; mes "Please give the child the ^4d4dffInside-out Shirt^000000 when found."; @@ -3099,7 +3105,7 @@ ma_fild01,203,189,3 script Little Girl#malaya 4_F_BARYO_GIRL,{ } ma_fild01,251,93,3 script Lost Child#malaya01 4_F_BARYO_GIRL,{ - if (checkquest(7388) > -1) { + if (questprogress(7388)) { if (!countitem(12700)) { mes "[Little Kid]"; mes "Sigh. Are you lost too?"; @@ -3144,7 +3150,7 @@ ma_fild01,251,93,3 script Lost Child#malaya01 4_F_BARYO_GIRL,{ } end; } else { - if (checkquest(7389) != -1) { + if (questprogress(7389)) { mes "[Little Kid]"; mes "I want to play some more."; mes "I can always go back with this shirt."; @@ -3226,8 +3232,8 @@ ma_fild02,241,39,5 script Good Capre Budidai 4_MAL_BUDIDAI,{ mes "We'll never make it."; close; } - .@playtime = checkquest(7410, PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7410, PLAYTIME); + if (.@playtime == 1) { mes "[Budidai]"; mes "Traveler, my friend!"; mes "Bongisungisu ran far far away."; @@ -3243,8 +3249,8 @@ ma_fild02,241,39,5 script Good Capre Budidai 4_MAL_BUDIDAI,{ mes "You won't turn you're back on a good Capre?"; close; } else { - if (checkquest(7409) != -1) { - if (checkquest(7409, HUNTING) == 2) { + if (questprogress(7409)) { + if (questprogress(7409, HUNTING) == 2) { mes "[Budidai]"; mes "Astonishing, wanderer!"; mes "I could hear the pitiful wails of Bongisungisu all the way from here!"; @@ -4642,8 +4648,8 @@ malaya,290,340,3 script Guard Leader#buwaya 4_MAL_CAPTAIN,{ getexp 1000000, 600000; completequest 2280; } else { - set .@hunting, checkquest(2281,HUNTING); - if (.@hunting == -1) { + .@hunting = questprogress(2281,HUNTING); + if (!.@hunting) { mes "[Guard Leader]"; mes "Hear Buwaya appeared from the depth of the Forest."; mes "As everyone knows, all our manpower is dispatched to handle Bangungots servants attacking the hospital recently."; @@ -4673,7 +4679,7 @@ malaya,290,340,3 script Guard Leader#buwaya 4_MAL_CAPTAIN,{ mes "Keep this in mind and be cautious at all times."; mes "I recommend asking trustful colleagues for help."; setquest 2281; - } else if (.@hunting == 0 || .@hunting == 1) { + } else if (.@hunting == 1) { mes "[Guard Leader]"; mes "How is it going with the Buwaya situation?"; next; @@ -6150,7 +6156,7 @@ malaya,289,364,4 script Young Fortune Teller 4_F_MALAYA,{ close; } } else if (malaya_bakona2 == 7) { - if (checkquest(1186,HUNTING) == 2) { + if (questprogress(1186,HUNTING) == 2) { mes "[Young Fortune Teller]"; mes "It looks like you took care of ^FF0000Tikbalang^000000"; mes "well enough."; @@ -6549,7 +6555,7 @@ sec_in02,10,16,5 script Bakonawa Intro Helper 4_MASK_SMOKEY,{ set malaya_bakona1,0; set malaya_bakona2,0; for(set .@i,1174; .@i<=1193; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } close; @@ -6558,7 +6564,7 @@ sec_in02,10,16,5 script Bakonawa Intro Helper 4_MASK_SMOKEY,{ mes "Here you go!"; set malaya_bakona1,6; for(set .@i,1174; .@i<=1178; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } setquest 1179; @@ -6568,7 +6574,7 @@ sec_in02,10,16,5 script Bakonawa Intro Helper 4_MASK_SMOKEY,{ mes "Here you go!"; set malaya_bakona2,0; for(set .@i,1180; .@i<=1193; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } close; @@ -6583,7 +6589,7 @@ sec_in02,10,16,5 script Bakonawa Intro Helper 4_MASK_SMOKEY,{ set malaya_bakona2,8; setquest 1187; for(set .@i,1178; .@i<=1193; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } close; @@ -6689,7 +6695,7 @@ function script F_Malaya_Nurse { callsub L_Warp, getarg(0), 1; } else if (malaya_bang == 40) { callsub L_Weight; - if (checkquest(11309,HUNTING) == 2) { + if (questprogress(11309,HUNTING) == 2) { callsub L_Complete; set malaya_bang,41; completequest 11309; @@ -6703,7 +6709,7 @@ function script F_Malaya_Nurse { } } else if (malaya_bang > 40) { if (malaya_bang == 42) { - if (checkquest(11309,HUNTING) == 2) { + if (questprogress(11309,HUNTING) == 2) { callsub L_Complete; set malaya_bang,41; completequest 11309; diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt index a8697058a..94429ae8e 100644 --- a/npc/re/quests/quests_mora.txt +++ b/npc/re/quests/quests_mora.txt @@ -138,7 +138,7 @@ mid_camp,148,222,4 script Theore#ep14_1_bs 4_F_SCIENCE,3,3,{ } } } else if (ep14_1_bs == 2) { - if (checkquest(11182,PLAYTIME) < 2) { + if (questprogress(11182,PLAYTIME) != 2) { mes "[Theore]"; mes "......"; switch(rand(1,4)) { @@ -530,7 +530,7 @@ splendide,183,117,4 script Tired-looking Fairy 4_F_FAIRYKID3,{ mes "I'm tired, don't talk to me."; close; } else if (ep14_1_bs < 10) { - if (checkquest(11187) == -1) { + if (!questprogress(11187)) { mes "[Tired-looking Fairy]"; mes "I'm tired, don't talk to me."; next; @@ -552,7 +552,7 @@ splendide,183,117,4 script Tired-looking Fairy 4_F_FAIRYKID3,{ mes "Then tell me if you remember anything."; close; } - } else if (checkquest(11187) == 2) { + } else if (questprogress(11187) == 2) { mes "[Tired-looking Fairy]"; mes "I hope you can find the owner."; close; @@ -771,7 +771,7 @@ splendide,119,138,4 script Kusmi#ep14_1_bs 4_F_FAIRYKID5,{ next; mes "[Kusmi]"; mes "If you go to the warehouse in Mora Village, the manager will tell you moree."; - if (checkquest(11193) > -1 && checkquest(11193) < 2) + if (questprogress(11193) == 1) close; mes "Also, on the way back, will you check to see that my friend Rondo is in Mora Villagee?"; next; @@ -779,7 +779,7 @@ splendide,119,138,4 script Kusmi#ep14_1_bs 4_F_FAIRYKID5,{ mes "He always used to visit Splendide around this time, but the situation is no good now. I'll have to tell him to come another time."; close; } else if (ep14_1_bs > 14) { - if (checkquest(11193) == -1) { + if (!questprogress(11193)) { mes "[Kusmi]"; mes "Will you check to see that my friend Rondo is in Mora Villagee?"; next; @@ -802,7 +802,7 @@ splendide,119,138,4 script Kusmi#ep14_1_bs 4_F_FAIRYKID5,{ mes "[Kusmi]"; mes "Oh, And Daphrer is in northwest Splendide."; } - if (checkquest(11193) < 2) { + if (questprogress(11193) != 2) { completequest 11192; completequest 11193; } @@ -958,14 +958,14 @@ splendide,304,295,4 script Theodore#ep14_1_bs 4_M_FAIRYKID4,{ mes "[Theodore]"; mes "If you speak to the Warehouse Manager of Mora Village, you'd be able to get more information."; mes "If you're willing, will you go to Bifrost's 'Mora' Village and meet the Warehouse Manager?"; - if (checkquest(11199) > -1 && checkquest(11199) < 2) + if (questprogress(11199) == 1) close; next; mes "[Theodore]"; mes "And if it's not too much trouble, you could drop by my friend Lilitia's also..."; close; } else if (ep14_1_bs > 14) { - if (checkquest(11199) == -1) { + if (!questprogress(11199)) { mes "[Theodore]"; mes "And if it's not too much trouble, you could drop by my friend Lilitia's also..."; close; @@ -984,7 +984,7 @@ splendide,304,295,4 script Theodore#ep14_1_bs 4_M_FAIRYKID4,{ mes "[Theodore]"; mes "Oh, And Daphrer is in northwest Splendide."; } - if (checkquest(11199) < 2) { + if (questprogress(11199) != 2) { completequest 11198; completequest 11199; } @@ -1140,7 +1140,7 @@ splendide,168,301,4 script Pauchon#ep14_1_bs 4_F_FAIRYKID4,{ next; mes "[Pauchon]"; mes "The supplies from the mainland come through the Village. If you go speak to the Warehouse Manager, he'll be able to tell you something."; - if (checkquest(11205) > -1 && checkquest(11205) < 2) + if (questprogress(11205) == 1) close; mes "Also, please pay a visit to my friend Humming."; next; @@ -1148,7 +1148,7 @@ splendide,168,301,4 script Pauchon#ep14_1_bs 4_F_FAIRYKID4,{ mes "He's such a flighty guy, might have already left, but we were supposed to meet up in Mora Village."; close; } else if (ep14_1_bs > 14) { - if (checkquest(11205) == -1) { + if (!questprogress(11205)) { mes "[Pauchon]"; mes "Please pay a visit to my friend Humming."; mes "He's such a flighty guy, might have already left, but we were supposed to meet up in Mora Village."; @@ -1167,7 +1167,7 @@ splendide,168,301,4 script Pauchon#ep14_1_bs 4_F_FAIRYKID4,{ mes "[Pauchon]"; mes "Oh, And Daphrer is in northwest Splendide."; } - if (checkquest(11205) < 2) { + if (questprogress(11205) != 2) { completequest 11204; completequest 11205; } @@ -1201,13 +1201,13 @@ splendide,262,376,4 script Laphine Soldier#ep14_1 4_M_FAIRYSOLDIER,{ next; mes "[Laphine Soldier]"; mes "You can get to Alfheim by making it through the Maze of the Hazy Forest. However, nobody has ever come back from the Maze of the Hazy Forest."; - if (checkquest(11190) > -1 && checkquest(11190) < 2) { + if (questprogress(11190) == 1) { set ep14_1_bs,13; changequest 11190,11191; - } else if (checkquest(11196) > -1 && checkquest(11196) < 2) { + } else if (questprogress(11196) == 1) { set ep14_1_bs,13; changequest 11196,11197; - } else if (checkquest(11202) > -1 && checkquest(11202) < 2) { + } else if (questprogress(11202) == 1) { set ep14_1_bs,13; changequest 11202,11203; } @@ -1270,7 +1270,7 @@ mora,35,119,4 script Rondo#ep14_1_bs 4_M_DOGTRAVELER,{ mes "[Rondo]"; mes "Please tell Kusmi"; mes "that if he wants to meet, we can meet any time. There is nothing to worry about."; - if (checkquest(11193) == -1) + if (!questprogress(11193)) setquest 11193; } close; @@ -1290,7 +1290,7 @@ mora,98,66,4 script Lilitia#ep14_1_bs 4_F_RAFLE_PK,{ mes "[Lilitia]"; mes "What? Theodore sent you?"; mes "Please tell him that I'm so mad!!"; - if (checkquest(11199) == -1) + if (!questprogress(11199)) setquest 11199; close; } @@ -1316,7 +1316,7 @@ mora,139,102,2 script Humming#ep14_1_bs 4_F_DOGTRAVELER,{ mes "[Humming]"; mes "If you reach Splendide before me, please tell Pauchon"; mes "that I'm going through the Maze of the Hazy Forest."; - if (checkquest(11205) == -1) + if (!questprogress(11205)) setquest 11205; close; } @@ -1465,7 +1465,7 @@ sec_in02,35,175,0 script Theore Set Guid 4_F_FAIRYKID,{ dic_in01,262,191,0 script #ep14_1_xq02 HIDDEN_WARP_NPC,0,3,{ end; OnTouch: - if (ep13_3_secret > 22 && checkquest(7206) == -1) { + if (ep13_3_secret > 22 && !questprogress(7206)) { enablenpc "Cheshire#ep14_1_xq01"; cutin "ep13_cheshire_h",1; mes "[Cheshire]"; @@ -1507,8 +1507,8 @@ dic_dun01,274,114,0 script Stacked Boxes of Goods CLEAR_NPC,{ mes "- You have too many items to do this quest. -"; close; } - set .@playtime, checkquest(7208,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7208,PLAYTIME); + if (.@playtime == 1) { mes "Boxes with all kinds of goods in them are stacked to the ceiling."; mes "The marked box Cheshire was talking about doesn't seem to be here yet."; close; @@ -1531,8 +1531,8 @@ dic_dun01,274,114,0 script Stacked Boxes of Goods CLEAR_NPC,{ close; } } else { - if (checkquest(7207) == -1) { - if (checkquest(7206) > -1) { + if (!questprogress(7207)) { + if (questprogress(7206)) { mes "Boxes with all kinds of goods in them are stacked to the ceiling."; mes "Looking closely, you find a box with a small piece of paper stuck to it."; next; @@ -1545,7 +1545,7 @@ dic_dun01,274,114,0 script Stacked Boxes of Goods CLEAR_NPC,{ getitem 6392,1; //Bradium_Box close; } - } else if (checkquest(7207) < 2) { + } else if (questprogress(7207) != 2) { mes "You've already obtained the box Cheshire was talking about."; mes "Now you only have to take it to the Crevice of Bifrost."; close; @@ -1562,7 +1562,7 @@ bif_fild01,335,168,3 script Cheshire#ep14_1_xq04 4_M_CATMAN1,{ close; } cutin "ep13_cheshire",1; - if (checkquest(7209) > -1) { + if (questprogress(7209)) { if (countitem(6090) < 20) { mes "[Cheshire]"; mes "Bring me 20 pieces of refined Bradium."; @@ -1592,7 +1592,7 @@ bif_fild01,335,168,3 script Cheshire#ep14_1_xq04 4_M_CATMAN1,{ end; } callsub L_CheckPlaytime; - if (checkquest(7210) > -1) { + if (questprogress(7210)) { if (countitem(6392) == 0) callsub L_LostQuest,7210; else { @@ -1616,8 +1616,8 @@ bif_fild01,335,168,3 script Cheshire#ep14_1_xq04 4_M_CATMAN1,{ } } if (ep13_3_secret > 22) { - if (checkquest(7207) == -1) { - if (checkquest(7206) == -1) { + if (!questprogress(7207)) { + if (!questprogress(7206)) { mes "[Cheshire]"; mes "...Hmm? Huh?"; mes "It's "+strcharinfo(0)+"!"; @@ -1685,7 +1685,7 @@ bif_fild01,335,168,3 script Cheshire#ep14_1_xq04 4_M_CATMAN1,{ cutin "",255; end; } - } else if (checkquest(7207) < 2) { + } else if (questprogress(7207) != 2) { if (countitem(6392) == 0) callsub L_LostQuest,7207; else { @@ -1828,8 +1828,8 @@ L_LostQuest: cutin "",255; end; L_CheckPlaytime: - set .@playtime, checkquest(7208,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7208,PLAYTIME); + if (.@playtime == 1) { mes "[Cheshire]"; mes "Each day, one of these boxes is sent to Kamidal Tunnel."; mes "It's smuggled in among other items."; @@ -2662,7 +2662,7 @@ mora,31,138,6 script Raffle Researcher#ep14 4_M_RAFLE_OR,{ emotion e_paper; close; } else if (ep14_1_muk == 1) { - if (checkquest(5016) > -1 && countitem(6385) == 0) { + if (questprogress(5016) && countitem(6385) == 0) { mes "[Raffle Researcher]"; mes "You're back? Where are my research tools?"; emotion e_what; @@ -2716,7 +2716,7 @@ mora,31,138,6 script Raffle Researcher#ep14 4_M_RAFLE_OR,{ close; } else if (ep14_1_muk == 2) { // Unofficial check, but it's needed here. - if (checkquest(5029,PLAYTIME) == 0 || checkquest(5029,PLAYTIME) == 1) { + if (questprogress(5029,PLAYTIME) == 1) { mes "[Raffle Researcher]"; mes "It must've been hard work to retrieve the tools."; mes "Why don't you take this and go to the inn"; @@ -2847,7 +2847,7 @@ mora,31,138,6 script Raffle Researcher#ep14 4_M_RAFLE_OR,{ setquest 5019; close; } else if (ep14_1_muk == 7) { - if (checkquest(5019) > -1 && countitem(6386) < 10) { + if (questprogress(5019) && countitem(6386) < 10) { mes "[Raffle Researcher]"; mes "Have you collected the samples yet?"; mes "Please hurry up."; @@ -2882,7 +2882,7 @@ mora,31,138,6 script Raffle Researcher#ep14 4_M_RAFLE_OR,{ setquest 5020; close; } else if (ep14_1_muk == 8) { - if (checkquest(5020,PLAYTIME) == 0 || checkquest(5020,PLAYTIME) == 1) { + if (questprogress(5020,PLAYTIME) == 1) { mes "[Raffle Researcher]"; mes "The basic tests have not been completed yet."; mes "There's nothing for you to do now."; @@ -2924,8 +2924,8 @@ mora,31,138,6 script Raffle Researcher#ep14 4_M_RAFLE_OR,{ setquest .@quest; close; } else if (ep14_1_muk == 9) { - if (checkquest(5021) > -1 || checkquest(5022) > -1) { - if (checkquest(5021) > -1) { + if (questprogress(5021) || questprogress(5022)) { + if (questprogress(5021)) { set .@quest,5021; set .@item,6387; //Teeth_Sample setarray .@str$[0],"tooth","teeth"; @@ -2966,7 +2966,7 @@ mora,31,138,6 script Raffle Researcher#ep14 4_M_RAFLE_OR,{ erasequest .@quest; setquest 5023; close; - } else if (checkquest(5023,PLAYTIME) == 0 || checkquest(5023,PLAYTIME) == 1) { + } else if (questprogress(5023,PLAYTIME) == 1) { mes "[Raffle Researcher]"; mes "I'm still analyzing the DNA."; mes "The DNA analysis takes about 6 hours."; @@ -3189,7 +3189,7 @@ mora,31,138,6 script Raffle Researcher#ep14 4_M_RAFLE_OR,{ mes "will take about 12 hours."; close; } else if (ep14_1_muk == 14) { - if (checkquest(5028,PLAYTIME) == 0 || checkquest(5028,PLAYTIME) == 1) { + if (questprogress(5028,PLAYTIME) == 1) { mes "[Raffle Researcher]"; mes "What? You're here? Well..."; next; @@ -3462,8 +3462,8 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ donpcevent "Black Shadow#ep14_muk::OnDisable"; end; } - set .@playtime, checkquest(5029,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(5029,PLAYTIME); + if (.@playtime == 1) { mes "You see a dark hole. As you show interest, something disappears quickly into the dark hole."; close2; donpcevent "Black Shadow#ep14_muk::OnDisable"; @@ -3471,7 +3471,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ } else if (.@playtime == 2) erasequest 5029; if (ep14_1_goki == 30) { - if (checkquest(5030) == -1 && checkquest(5031) == -1 && checkquest(5032) == -1 && checkquest(5033) == -1 && checkquest(5034) == -1) { + if (!questprogress(5030) && !questprogress(5031) && !questprogress(5032) && !questprogress(5033) && !questprogress(5034)) { mes "[Unidentified creature]"; mes "Arrgghh!!!"; mes "Why you bother me."; @@ -3548,7 +3548,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ mes "You tell me my family do okay."; setquest 5030+rand(4); //5030,5031,5032,5033 close; - } else if (checkquest(5030) > -1 || checkquest(5031) > -1 || checkquest(5032) > -1 || checkquest(5033) > -1) { + } else if (questprogress(5030) || questprogress(5031) || questprogress(5032) || questprogress(5033)) { mes "[Fishee]"; mes "Please. In puddle."; mes "You tell me my family do okay."; @@ -3567,7 +3567,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ mes "Please. In puddle."; mes "You tell me my family do okay."; close; - } else if (checkquest(5034) > -1 && checkquest(5034) < 2) { + } else if (questprogress(5034) == 1) { if (MaxWeight - Weight < 100 || checkweight(5792,1) == 0) { mes "[Fishee]"; mes "You have lots."; @@ -3593,7 +3593,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ completequest 5034; getitem 5792,1; //Fish_Pin close; - } else if (checkquest(5034) == 2) { + } else if (questprogress(5034) == 2) { mes "[Fishee]"; mes "You... I saw. Feeling. I saw. Feeling."; mes "You... Name?"; @@ -3711,7 +3711,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ if (.@npc_hp <= 0) { mes "You won. The unidentified creature is unconscious."; next; - if (checkquest(5016) > -1 && countitem(6385) == 0) { + if (questprogress(5016) && countitem(6385) == 0) { mes "What will you do?"; next; select("Look for the research tools."); @@ -3733,7 +3733,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ close2; donpcevent "Black Shadow#ep14_muk::OnDisable"; end; - } else if (checkquest(5017) > -1) { + } else if (questprogress(5017)) { mes "How will you bully the creature?"; next; input .@inputstr$; @@ -4076,7 +4076,7 @@ OnFullon: } - script ???#mora -1,{ - if (checkquest(5019) > -1) { + if (questprogress(5019)) { mes "You find an area emitting a distinct aura."; mes "You may be able to collect bath water samples."; mes "What will you do?"; @@ -4119,8 +4119,8 @@ OnFullon: close2; donpcevent strnpcinfo(0)+"::OnDisable"; end; - } else if (checkquest(5021) > -1 || checkquest(5022) > -1) { - if (checkquest(5021) > -1) { + } else if (questprogress(5021) || questprogress(5022)) { + if (questprogress(5021)) { set .@str$,"tooth"; set .@item,6387; //Teeth_Sample } else { @@ -4191,12 +4191,12 @@ OnTimer60000: donpcevent strnpcinfo(0)+"::OnEnable"; end; OnTouch: - if (checkquest(5034) == 2 || ep14_1_muk == 0 || rand(5)) { + if (questprogress(5034) == 2 || ep14_1_muk == 0 || rand(5)) { percentheal 5,5; end; } - set .@playtime, checkquest(5029,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(5029,PLAYTIME); + if (.@playtime == 1) { percentheal 5,5; end; } else if (.@playtime == 2) { @@ -4225,7 +4225,7 @@ mora,118,86,0 duplicate(???#mora) ???#ep14_muk05 CLEAR_NPC,2,2 setarray .@quest1[1],5024,5025,5026,5027; setarray .@dir$[1],"east","west","south","north"; - if (checkquest(.@quest1[.@i]) > -1) { + if (questprogress(.@quest1[.@i])) { if (countitem(6389) == 0) { mes "This appears to be the puddle to the "+.@dir$[.@i]; mes "that the researcher talked about."; @@ -4259,9 +4259,9 @@ mora,118,86,0 duplicate(???#mora) ???#ep14_muk05 CLEAR_NPC,2,2 deletearray .@quest1[.@i],1; deletearray .@dir$[.@i],1; - if (checkquest(.@quest1[1]) > -1 || checkquest(.@quest1[2]) > -1 || checkquest(.@quest1[3]) > -1) { + if (questprogress(.@quest1[1]) || questprogress(.@quest1[2]) || questprogress(.@quest1[3])) { for(set .@j,1; .@j<=3; set .@j,.@j+1) { - if (checkquest(.@quest1[.@j]) > -1) + if (questprogress(.@quest1[.@j])) break; } mes "This is not the puddle to the "+.@dir$[.@j]+"."; @@ -4272,7 +4272,7 @@ mora,118,86,0 duplicate(???#mora) ???#ep14_muk05 CLEAR_NPC,2,2 set .@quest2[0], .@quest2[.@i]; deletearray .@quest2[.@i],1; - if (ep14_1_goki == 30 && checkquest(.@quest2[0]) > -1) { + if (ep14_1_goki == 30 && questprogress(.@quest2[0])) { mes "You arrived at the puddle to the "+.@dir$[0]+"."; mes "You should look for the unidentified creature's family."; next; @@ -4329,13 +4329,13 @@ mora,118,86,0 duplicate(???#mora) ???#ep14_muk05 CLEAR_NPC,2,2 mes "We okay. Happy. Here. You tell son."; changequest .@quest2[0],5034; close; - } else if (checkquest(5034) > -1 && checkquest(5034) < 2) { + } else if (questprogress(5034) == 1) { mes "[Fishee's Dad]"; mes "Yes... Human give son news."; mes "Thanks. Son,"; mes "We okay. Happy. Here. You tell son."; close; - } else if (checkquest(.@quest2[1]) > -1 || checkquest(.@quest2[2]) > -1 || checkquest(.@quest2[3]) > -1) { + } else if (questprogress(.@quest2[1]) || questprogress(.@quest2[2]) || questprogress(.@quest2[3])) { mes "You arrived at the puddle to the "+.@dir$[0]+"."; mes "You should look for the unidentified creature's family."; next; @@ -4377,8 +4377,8 @@ mora,133,80,6 script Elephantine#pa0829 4_ELEPHANT,{ mes "Why don't you come back when you've grown stronger? I can't give you tasks when you're in your current state."; close; } - set .@playtime, checkquest(12230,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(12230,PLAYTIME); + if (.@playtime == 1) { mes "[Elephantine]"; mes "I have no additional tasks available now. If I get some, I'll let you know when you come back."; close; @@ -4485,8 +4485,8 @@ mora,115,98,8 script Hotcha#pa0829 4_ELEPHANT,{ mes "This place is like a paradise for adventurers. Not for weak ones like you, though."; close; } - set .@playtime, checkquest(12230,PLAYTIME); - if (.@playtime == -1) { + .@playtime = questprogress(12230,PLAYTIME); + if (!.@playtime) { mes "[Hotcha]"; mes "I see you haven't received"; mes "any tasks yet."; @@ -4504,7 +4504,7 @@ mora,115,98,8 script Hotcha#pa0829 4_ELEPHANT,{ mes "[Hotcha]"; mes "Once they are removed, go talk to Elephantine and you can receive new tasks."; for(set .@i,12225; .@i<=12229; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } erasequest 12230; @@ -4521,7 +4521,7 @@ mora,115,98,8 script Hotcha#pa0829 4_ELEPHANT,{ next; for(set .@i,12225; .@i<=12229; set .@i,.@i+1) { - if (checkquest(.@i,HUNTING) == 2) { + if (questprogress(.@i,HUNTING) == 2) { mes "[Hotcha]"; mes "Yes, I see you've completed the task. It has been confirmed as completed."; erasequest .@i; @@ -4560,8 +4560,8 @@ mora,119,103,4 script Bow-wow#pa0829 4_M_DOGTRAVELER,{ mes "You really have no clue. What could you do with such a weak body?"; close; } - set .@playtime, checkquest(12241,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(12241,PLAYTIME); + if (.@playtime == 1) { mes "[Bow-wow]"; mes "I have no additional tasks available now. If I get some, I'll let you know when you come back."; close; @@ -4668,8 +4668,8 @@ mora,119,118,4 script General Good Dealer#pa0 4_M_RAFLE_GR,{ mes "What could you do with that fragile body? Go get some exercise."; close; } - set .@playtime, checkquest(12241,PLAYTIME); - if (.@playtime == -1) { + .@playtime = questprogress(12241,PLAYTIME); + if (!.@playtime) { mes "[General Good Dealer]"; mes "I see you haven't received"; mes "any tasks yet."; @@ -4687,7 +4687,7 @@ mora,119,118,4 script General Good Dealer#pa0 4_M_RAFLE_GR,{ mes "[General Good Dealer]"; mes "Once they are removed, go talk to Bow-wow and you can receive new tasks."; for(set .@i,12231; .@i<=12235; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } erasequest 12241; @@ -4716,7 +4716,7 @@ mora,119,118,4 script General Good Dealer#pa0 4_M_RAFLE_GR,{ close; L_CheckQuest: - if (checkquest(getarg(0)) > -1) { + if (questprogress(getarg(0))) { if (countitem(getarg(1)) < getarg(2)) { mes "[General Good Dealer]"; mes "The amount is not enough..."; @@ -4756,8 +4756,8 @@ mora,124,108,7 script Woof-grrr#pa0829 4_M_DOGTRAVELER2,{ mes "This place is not a nursery. Grow up and come back, and I'll gladly give you tasks."; close; } - set .@playtime, checkquest(12242,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(12242,PLAYTIME); + if (.@playtime == 1) { mes "[Woof-grrr]"; mes "I have no additional tasks available now. If I get some, I'll let you know when you come back."; close; @@ -4864,8 +4864,8 @@ mora,127,112,4 script Commodities Dealer#pa08 4_F_RAFLE_PK,{ mes "Go away! I can't concentrate on cataloging with you hanging around like that..."; close; } - set .@playtime, checkquest(12242,PLAYTIME); - if (.@playtime == -1) { + .@playtime = questprogress(12242,PLAYTIME); + if (!.@playtime) { mes "[Commodities Dealer]"; mes "I see you haven't received"; mes "any tasks yet."; @@ -4883,7 +4883,7 @@ mora,127,112,4 script Commodities Dealer#pa08 4_F_RAFLE_PK,{ mes "[Commodities Dealer]"; mes "Once they are removed, go talk to Woof-grrr and you can receive new tasks."; for(set .@i,12236; .@i<=12240; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } erasequest 12242; @@ -4912,7 +4912,7 @@ mora,127,112,4 script Commodities Dealer#pa08 4_F_RAFLE_PK,{ close; L_CheckQuest: - if (checkquest(getarg(0)) > -1) { + if (questprogress(getarg(0))) { if (countitem(getarg(1)) < getarg(2)) { mes "[Commodities Dealer]"; mes "The amount is not enough..."; @@ -4952,8 +4952,8 @@ mora,170,101,4 script Soul Guide#pa0829 4_F_DOGTRAVELER,{ mes "You need to have a strong spirit to do this task. I think you need a lot more discipline."; close; } - set .@playtime, checkquest(12253,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(12253,PLAYTIME); + if (.@playtime == 1) { mes "You still have marks of the haunting souls on your body."; next; mes "You'll have to come back when the marks have disappeared."; @@ -4961,7 +4961,7 @@ mora,170,101,4 script Soul Guide#pa0829 4_F_DOGTRAVELER,{ } else if (.@playtime == 2) { mes "You feel your mind has calmed down once again. You now have enough energy to go look for other souls, so talk to the Guide again."; for(set .@i,12243; .@i<=12252; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } erasequest 12253; @@ -5089,7 +5089,7 @@ sec_in02,29,34,5 script Initializing Mora Sanjo 4_MAN_NITT,{ mes "14.1 Initializing all quest window include related daily quest and map and so on"; freeloop(1); for(set .@i,12225; .@i<=12353; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } freeloop(0); @@ -5106,7 +5106,7 @@ function script mora_remains { mes "You have to make space in your inventory."; close; } - if (checkquest(getarg(0)) > -1) { + if (questprogress(getarg(0))) { specialeffect2 EF_BLIND; specialeffect2 EF_BEGINSPELL; progressbar "ffff00",4; @@ -5155,8 +5155,8 @@ mora,118,166,6 script Knights Chief#mo 4_F_RAFLE_VI,{ } mora,116,165,5 script Knights Boss#mo 4_M_RAFLE_VI,{ - set .@playtime, checkquest(1119,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(1119,PLAYTIME); + if (.@playtime == 1) { mes "[Order of the Knights Boss]"; mes "We've run out of Mora Coins."; mes "Come back tomorrow!"; diff --git a/npc/re/quests/quests_morocc.txt b/npc/re/quests/quests_morocc.txt index 480618a70..5632245f0 100644 --- a/npc/re/quests/quests_morocc.txt +++ b/npc/re/quests/quests_morocc.txt @@ -119,15 +119,15 @@ moc_prydn1,94,98,3 script Suspicious Cat#night2 4_CAT_SAILOR4,{ warp "moc_prydb1",100,57; end; case 2: - set .@playtime, checkquest(2290,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(2290,PLAYTIME); + if (.@playtime == 1) { mes "[Suspicious Cat]"; mes "Look at that Verit, he's afraid of us! Kyaahaha! We're safe, at least for a while!"; close; } else if (.@playtime == 2) erasequest 2290; - set .@hunting, checkquest(2289,HUNTING); - if (.@hunting == -1) { + .@hunting = questprogress(2289,HUNTING); + if (!.@hunting) { mes "[Suspicious Cat]"; mes "Did you know that cats and dogs don't get along?"; next; @@ -157,7 +157,7 @@ moc_prydn1,94,98,3 script Suspicious Cat#night2 4_CAT_SAILOR4,{ mes "Pah! You don't care about me? Fine, you traitor!"; close; } - } else if (.@hunting == 0 || .@hunting == 1) { + } else if (.@hunting == 1) { mes "[Suspicious Cat]"; mes "Is Verit's training going well?"; next; @@ -181,15 +181,15 @@ moc_prydn1,94,98,3 script Suspicious Cat#night2 4_CAT_SAILOR4,{ close; } case 3: - set .@playtime, checkquest(2291,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(2291,PLAYTIME); + if (.@playtime == 1) { mes "[Suspicious Cat]"; mes "Good, I'll make a good use of the time you gained! But I gotta do something about this stomachache first....."; close; } else if (.@playtime == 2) erasequest 2291; - set .@hunting, checkquest(2292,HUNTING); - if (.@hunting == -1) { + .@hunting = questprogress(2292,HUNTING); + if (!.@hunting) { mes "[Suspicious Cat]"; mes "Precious treasures are supposed to be hidden in the deep secret places here!"; mes "I'm sure the mummy's precious treasures are hidden in the second basement level."; @@ -217,7 +217,7 @@ moc_prydn1,94,98,3 script Suspicious Cat#night2 4_CAT_SAILOR4,{ mes "Bah, you're so cold-hearted."; close; } - } else if (.@hunting == 0 || .@hunting == 1) { + } else if (.@hunting == 1) { mes "[Suspicious Cat]"; mes "Is fighting Ancient Mummies going well?"; next; |