summaryrefslogtreecommitdiff
path: root/npc/re/jobs
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re/jobs')
-rw-r--r--npc/re/jobs/3-1/guillotine_cross.txt93
-rw-r--r--npc/re/jobs/3-1/ranger.txt25
-rw-r--r--npc/re/jobs/3-1/rune_knight.txt10
-rw-r--r--npc/re/jobs/3-2/genetic.txt62
-rw-r--r--npc/re/jobs/3-2/minstrel.txt2
-rw-r--r--npc/re/jobs/3-2/shadow_chaser.txt12
-rw-r--r--npc/re/jobs/3-2/sura.txt2
-rw-r--r--npc/re/jobs/3-2/wanderer.txt6
-rw-r--r--npc/re/jobs/novice/novice.txt40
-rw-r--r--npc/re/jobs/novice/supernovice_ex.txt20
-rw-r--r--npc/re/jobs/repair.txt8
11 files changed, 140 insertions, 140 deletions
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]";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-29 13:24:23 +0000