summaryrefslogtreecommitdiff
path: root/npc/re/jobs/novice/novice.txt
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-10-21 21:03:46 +0200
committerHaru <haru@dotalux.com>2014-10-28 00:28:47 +0100
commitbba3e690de390f1576d70f227f76b4721ac3a010 (patch)
tree5849259e9174eab76b65079f5617d4e509f099d1 /npc/re/jobs/novice/novice.txt
parent88929e74e284e649eb32b2a923f819c35ecccbf6 (diff)
downloadhercules-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>
Diffstat (limited to 'npc/re/jobs/novice/novice.txt')
-rw-r--r--npc/re/jobs/novice/novice.txt40
1 files changed, 20 insertions, 20 deletions
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);