summaryrefslogtreecommitdiff
path: root/npc/re/jobs/3-1
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re/jobs/3-1')
-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
3 files changed, 67 insertions, 61 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;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-02-04 05:34:32 +0000