summaryrefslogtreecommitdiff
path: root/npc/pre-re/jobs
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-10-20 04:33:58 +0200
committerHaru <haru@dotalux.com>2014-10-28 00:28:30 +0100
commit88929e74e284e649eb32b2a923f819c35ecccbf6 (patch)
tree5e0de6f3d1347adddcbfa7a1c51bd35bedf2aba9 /npc/pre-re/jobs
parent32169c383f2658192b6b8cb02d7f818a361dda03 (diff)
downloadhercules-88929e74e284e649eb32b2a923f819c35ecccbf6.tar.gz
hercules-88929e74e284e649eb32b2a923f819c35ecccbf6.tar.bz2
hercules-88929e74e284e649eb32b2a923f819c35ecccbf6.tar.xz
hercules-88929e74e284e649eb32b2a923f819c35ecccbf6.zip
Removed use of 'checkquest' from scripts (pre-re folder)
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/pre-re/jobs')
-rw-r--r--npc/pre-re/jobs/1-1/acolyte.txt4
-rw-r--r--npc/pre-re/jobs/1-1/mage.txt6
-rw-r--r--npc/pre-re/jobs/1-1/merchant.txt6
3 files changed, 8 insertions, 8 deletions
diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt
index 2faef7c87..49bb33c9b 100644
--- a/npc/pre-re/jobs/1-1/acolyte.txt
+++ b/npc/pre-re/jobs/1-1/acolyte.txt
@@ -182,10 +182,10 @@ prt_church,184,41,4 script Cleric#aco 1_M_PASTOR,{
skill 143,0,0;
callfunc "Job_Change",Job_Acolyte;
callfunc "F_ClearJobVar";
- if(checkquest(1001) != -1) {
+ if (questprogress(1001)) {
completequest 1001;
}
- else if(checkquest(1002) != -1) {
+ else if (questprogress(1002)) {
completequest 1002;
}
else {
diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt
index 2e03ce410..b2c6b346d 100644
--- a/npc/pre-re/jobs/1-1/mage.txt
+++ b/npc/pre-re/jobs/1-1/mage.txt
@@ -208,13 +208,13 @@ geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{
callfunc "Job_Change",Job_Mage;
callfunc "F_ClearJobVar";
Zeny += 50;
- if(checkquest(1005) != -1) {
+ if (questprogress(1005)) {
completequest 1005;
}
- else if(checkquest(1006) != -1) {
+ else if (questprogress(1006)) {
completequest 1006;
}
- else if(checkquest(1007) != -1) {
+ else if (questprogress(1007)) {
completequest 1007;
}
else {
diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt
index 47c1e3242..4162bf0b1 100644
--- a/npc/pre-re/jobs/1-1/merchant.txt
+++ b/npc/pre-re/jobs/1-1/merchant.txt
@@ -151,13 +151,13 @@ alberta_in,53,43,6 script Merchant#mer 4_M_04,{
mes "Congratulations!";
callfunc "Job_Change",Job_Merchant;
callfunc "F_ClearJobVar";
- if(checkquest(1009) != -1) {
+ if (questprogress(1009)) {
completequest 1009;
}
- else if(checkquest(1010) != -1) {
+ else if (questprogress(1010)) {
completequest 1010;
}
- else if(checkquest(1011) != -1) {
+ else if (questprogress(1011)) {
completequest 1011;
}
else {