summaryrefslogtreecommitdiff
path: root/npc/jobs/2-2
diff options
context:
space:
mode:
Diffstat (limited to 'npc/jobs/2-2')
-rw-r--r--npc/jobs/2-2/alchemist.txt12
-rw-r--r--npc/jobs/2-2/bard.txt2
-rw-r--r--npc/jobs/2-2/crusader.txt8
-rw-r--r--npc/jobs/2-2/dancer.txt4
-rw-r--r--npc/jobs/2-2/rogue.txt12
-rw-r--r--npc/jobs/2-2/sage.txt28
6 files changed, 33 insertions, 33 deletions
diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index 7e5ca7e33..b30defc48 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -234,10 +234,10 @@ alde_alche,27,185,5 script Alchemist Guildsman#am 4_F_ALCHE,{
mes "Okay, now you need to learn";
mes "the basics to being an Alchemist and learn the procedures for mixing chemicals and medicines.";
set ALCH_Q,4;
- if(checkquest(2028) != -1) {
+ if (questprogress(2028)) {
changequest 2028,2031;
}
- else if(checkquest(2029) != -1) {
+ else if (questprogress(2029)) {
changequest 2029,2031;
}
else {
@@ -267,10 +267,10 @@ alde_alche,27,185,5 script Alchemist Guildsman#am 4_F_ALCHE,{
mes "Okay, now you need to learn";
mes "the basics to being an Alchemist and learn the procedures for mixing chemicals and medicines.";
set ALCH_Q,4;
- if(checkquest(2028) != -1) {
+ if (questprogress(2028)) {
changequest 2028,2031;
}
- else if(checkquest(2029) != -1) {
+ else if (questprogress(2029)) {
changequest 2029,2031;
}
else {
@@ -1687,10 +1687,10 @@ alde_alche,101,184,4 script Master Alchemist#am 2_M_DYEINGER,{
cutin "",255;
end;
}
- if(checkquest(2039) != -1) {
+ if (questprogress(2039)) {
changequest 2039,2040;
}
- if(checkquest(2034) != -1) {
+ if (questprogress(2034)) {
changequest 2034,2040;
}
mes "Ah, well done.";
diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt
index 24d49cbce..55b7401a1 100644
--- a/npc/jobs/2-2/bard.txt
+++ b/npc/jobs/2-2/bard.txt
@@ -433,7 +433,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{
mes "Then, do you want to try singing...?";
mes "I'll sing a short melody...";
mes "and you try after.";
- if(checkquest(3003) == -1) {
+ if (!questprogress(3003)) {
changequest 3002,3003;
}
next;
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index d5bcd70ea..232e6c85e 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -245,10 +245,10 @@ prt_castle,45,169,5 script Senior Crusader 4_M_CRU_OLD,{
delitem .@item3, 10;
delitem .@item4, 10;
set CRUS_Q, 4;
- if(checkquest(3006) != -1) {
+ if (questprogress(3006)) {
changequest 3006,3009;
}
- else if(checkquest(3007) != -1) {
+ else if (questprogress(3007)) {
changequest 3007,3009;
}
else {
@@ -759,7 +759,7 @@ prt_church,95,127,3 script Crusader 4_F_CRU,{
close;
}
set CRUS_Q,7;
- if(checkquest(3011) != -1) {
+ if (questprogress(3011)) {
changequest 3011,3012;
}
mes "Hmmm... What a pity.";
@@ -866,7 +866,7 @@ prt_castle,35,151,5 script Patron Knight 4_M_CRU,{
mes "[Bliant Piyord]";
mes "To take the battle test, bring";
mes "1 ^3355FFHoly Water^000000. This will be used to purify you prior to taking the test.";
- if(checkquest(3013) != -1) {
+ if (questprogress(3013)) {
changequest 3013,3014;
}
next;
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index 6b4ddf5b0..a34bf0540 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -320,10 +320,10 @@ job_duncer,43,93,4 script Aile#da 4_F_07,{
mes "[Aile]";
mes "Next, go to ^CD6889Bijou^000000, who is in charge of the interviewing process. She will have a couple of things she'll need to ask you.";
set DANC_Q,5;
- if(checkquest(7001) != -1) {
+ if (questprogress(7001)) {
changequest 7001,7004;
}
- else if(checkquest(7002) != -1) {
+ else if (questprogress(7002)) {
changequest 7002,7004;
}
else {
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index cf20d5203..d0b2ba95f 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -757,10 +757,10 @@ in_rogue,376,23,1 script Mr. Smith#rg 1_M_LIBRARYMASTER,{
switch(rand(1,3)) {
case 1:
set ROGUE_Q,9;
- if(checkquest(2018) != -1) {
+ if (questprogress(2018)) {
changequest 2018,2022;
}
- else if(checkquest(2019) != -1) {
+ else if (questprogress(2019)) {
changequest 2019,2022;
}
else {
@@ -794,10 +794,10 @@ in_rogue,376,23,1 script Mr. Smith#rg 1_M_LIBRARYMASTER,{
close;
case 2:
set ROGUE_Q,10;
- if(checkquest(2018) != -1) {
+ if (questprogress(2018)) {
changequest 2018,2023;
}
- else if(checkquest(2019) != -1) {
+ else if (questprogress(2019)) {
changequest 2019,2023;
}
else {
@@ -830,10 +830,10 @@ in_rogue,376,23,1 script Mr. Smith#rg 1_M_LIBRARYMASTER,{
close;
case 3:
set ROGUE_Q,11;
- if(checkquest(2018) != -1) {
+ if (questprogress(2018)) {
changequest 2018,2024;
}
- else if(checkquest(2019) != -1) {
+ else if (questprogress(2019)) {
changequest 2019,2024;
}
else {
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index 72bacfaf1..4f0db7888 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -595,13 +595,13 @@ yuno_in03,154,35,4 script Staff of the Academy#a 2_M_SAGE_B,{
mes "Ah yes, everything is in readiness.";
mes "Next, you will take an entrance test.";
set SAGE_Q,4;
- if(checkquest(2043) != -1) {
+ if (questprogress(2043)) {
changequest 2043,2041;
}
- else if(checkquest(2044) != -1) {
+ else if (questprogress(2044)) {
changequest 2044,2041;
}
- else if(checkquest(2045) != -1) {
+ else if (questprogress(2045)) {
changequest 2045,2041;
}
else {
@@ -1881,10 +1881,10 @@ yuno_in03,32,102,1 script Biology Professor#sa 4_M_SAGE_C,{
switch(rand(1,4)) {
case 1:
set SAGE_Q2,4;
- if(checkquest(2053) != -1) {
+ if (questprogress(2053)) {
changequest 2053,2056;
}
- else if(checkquest(2054) != -1) {
+ else if (questprogress(2054)) {
changequest 2054,2056;
}
else {
@@ -1896,10 +1896,10 @@ yuno_in03,32,102,1 script Biology Professor#sa 4_M_SAGE_C,{
break;
case 2:
set SAGE_Q2,5;
- if(checkquest(2053) != -1) {
+ if (questprogress(2053)) {
changequest 2053,2057;
}
- else if(checkquest(2054) != -1) {
+ else if (questprogress(2054)) {
changequest 2054,2057;
}
else {
@@ -1911,10 +1911,10 @@ yuno_in03,32,102,1 script Biology Professor#sa 4_M_SAGE_C,{
break;
case 3:
set SAGE_Q2,6;
- if(checkquest(2053) != -1) {
+ if (questprogress(2053)) {
changequest 2053,2058;
}
- else if(checkquest(2054) != -1) {
+ else if (questprogress(2054)) {
changequest 2054,2058;
}
else {
@@ -1926,10 +1926,10 @@ yuno_in03,32,102,1 script Biology Professor#sa 4_M_SAGE_C,{
break;
case 4:
set SAGE_Q2,7;
- if(checkquest(2053) != -1) {
+ if (questprogress(2053)) {
changequest 2053,2059;
}
- else if(checkquest(2054) != -1) {
+ else if (questprogress(2054)) {
changequest 2054,2059;
}
else {
@@ -2002,13 +2002,13 @@ yuno_in03,32,102,1 script Biology Professor#sa 4_M_SAGE_C,{
next;
set SAGE_Q2,0;
set SAGE_Q,12;
- if(checkquest(2056) != -1) {
+ if (questprogress(2056)) {
changequest 2056,2051;
}
- else if(checkquest(2057) != -1) {
+ else if (questprogress(2057)) {
changequest 2057,2051;
}
- else if(checkquest(2058) != -1) {
+ else if (questprogress(2058)) {
changequest 2058,2051;
}
else {
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 19:19:20 +0000