Removed use of 'checkquest' from scripts (pre-re folder)

Signed-off-by: Haru <haru@dotalux.com>

21 files changed, 106 insertions, 106 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 {
diff --git a/npc/pre-re/quests/collection/quest_alligator.txt b/npc/pre-re/quests/collection/quest_alligator.txt
index 79c121ba5..327216667 100644
--- a/npc/pre-re/quests/collection/quest_alligator.txt
+++ b/npc/pre-re/quests/collection/quest_alligator.txt
@@ -13,8 +13,8 @@
 //============================================================
 
 cmd_fild01,362,256,3	script	Cuir#Gator_Hunt	1_M_MOC_LORD,{
-	if (checkquest(60119) != -1) {
-		if (checkquest(60119,HUNTING) != 2 ) {
+	if (questprogress(60119)) {
+		if (questprogress(60119,HUNTING) != 2) {
 			mes "[Cuir]";
 			mes "Have you finished hunting the 50 Alligators?";
 			next;
@@ -53,8 +53,8 @@ cmd_fild01,362,256,3	script	Cuir#Gator_Hunt	1_M_MOC_LORD,{
 			close;
 		}
 	}
-	if (checkquest(60120) != -1) {
-		if (checkquest(60120,HUNTING) != 2 ) {
+	if (questprogress(60120)) {
+		if (questprogress(60120,HUNTING) != 2) {
 			mes "[Cuir]";
 			mes "Have you finished hunting the 50 Alligators?";
 			next;
@@ -94,8 +94,8 @@ cmd_fild01,362,256,3	script	Cuir#Gator_Hunt	1_M_MOC_LORD,{
 			close;
 		}
 	}
-	if (checkquest(60121) != -1) {
-		if (checkquest(60121,HUNTING) != 2 ) {
+	if (questprogress(60121)) {
+		if (questprogress(60121,HUNTING)) {
 			mes "[Cuir]";
 			mes "Have you finished hunting the 150 Alligators?";
 			next;
diff --git a/npc/pre-re/quests/collection/quest_caramel.txt b/npc/pre-re/quests/collection/quest_caramel.txt
index 6815c62e1..5474939ff 100644
--- a/npc/pre-re/quests/collection/quest_caramel.txt
+++ b/npc/pre-re/quests/collection/quest_caramel.txt
@@ -13,8 +13,8 @@
 //============================================================
 
 mjolnir_01,296,29,6	script	Yullo#Caramel_Hunt	4_F_SISTER,{
-	if (checkquest(60116) != -1) {
-		if (checkquest(60116,HUNTING) != 2 ) {
+	if (questprogress(60116)) {
+		if (questprogress(60116,HUNTING) != 2) {
 			mes "[Yullo]";
 			mes "Have you finished hunting the 50 Caramels?";
 			next;
@@ -53,8 +53,8 @@ mjolnir_01,296,29,6	script	Yullo#Caramel_Hunt	4_F_SISTER,{
 			close;
 		}
 	}
-	if (checkquest(60117) != -1) {
-		if (checkquest(60117,HUNTING) != 2 ) {
+	if (questprogress(60117)) {
+		if (questprogress(60117,HUNTING) != 2) {
 			mes "[Yullo]";
 			mes "Have you finished hunting the 50 Caramels?";
 			next;
@@ -94,8 +94,8 @@ mjolnir_01,296,29,6	script	Yullo#Caramel_Hunt	4_F_SISTER,{
 			close;
 		}
 	}
-	if (checkquest(60118) != -1) {
-		if (checkquest(60118,HUNTING) != 2 ) {
+	if (questprogress(60118)) {
+		if (questprogress(60118,HUNTING) != 2) {
 			mes "[Yullo]";
 			mes "Have you finished hunting the 150 Caramels?";
 			next;
diff --git a/npc/pre-re/quests/collection/quest_coco.txt b/npc/pre-re/quests/collection/quest_coco.txt
index 7ba4cab02..541259954 100644
--- a/npc/pre-re/quests/collection/quest_coco.txt
+++ b/npc/pre-re/quests/collection/quest_coco.txt
@@ -13,8 +13,8 @@
 //============================================================
 
 mjolnir_01,293,20,3	script	Nutters#Coco_Hunt	4_M_YOYOROGUE,{
-	if (checkquest(60113) != -1) {
-		if (checkquest(60113,HUNTING) != 2 ) {
+	if (questprogress(60113)) {
+		if (questprogress(60113,HUNTING) != 2) {
 			mes "[Nutters]";
 			mes "Have you finished hunting the 50 Cocos?";
 			next;
@@ -53,8 +53,8 @@ mjolnir_01,293,20,3	script	Nutters#Coco_Hunt	4_M_YOYOROGUE,{
 			close;
 		}
 	}
-	if (checkquest(60114) != -1) {
-		if (checkquest(60114,HUNTING) != 2 ) {
+	if (questprogress(60114)) {
+		if (questprogress(60114,HUNTING) != 2) {
 			mes "[Nutters]";
 			mes "Have you finished hunting the 50 Cocos?";
 			next;
@@ -94,8 +94,8 @@ mjolnir_01,293,20,3	script	Nutters#Coco_Hunt	4_M_YOYOROGUE,{
 			close;
 		}
 	}
-	if (checkquest(60115) != -1) {
-		if (checkquest(60115,HUNTING) != 2 ) {
+	if (questprogress(60115)) {
+		if (questprogress(60115,HUNTING) != 2) {
 			mes "[Nutters]";
 			mes "Have you finished hunting the 150 Cocos?";
 			next;
diff --git a/npc/pre-re/quests/collection/quest_creamy.txt b/npc/pre-re/quests/collection/quest_creamy.txt
index ecdb6b0fb..7de8c7cf9 100644
--- a/npc/pre-re/quests/collection/quest_creamy.txt
+++ b/npc/pre-re/quests/collection/quest_creamy.txt
@@ -13,8 +13,8 @@
 //============================================================
 
 prt_fild04,356,148,3	script	Laertes#Creamy_Hunt	4_M_NFMAN,{
-	if (checkquest(60122) != -1) {
-		if (checkquest(60122,HUNTING) != 2 ) {
+	if (questprogress(60122)) {
+		if (questprogress(60122,HUNTING) != 2) {
 			mes "[Laertes]";
 			mes "Have you finished hunting the 50 Creamys?";
 			next;
@@ -53,8 +53,8 @@ prt_fild04,356,148,3	script	Laertes#Creamy_Hunt	4_M_NFMAN,{
 			close;
 		}
 	}
-	if (checkquest(60123) != -1) {
-		if (checkquest(60123,HUNTING) != 2 ) {
+	if (questprogress(60123)) {
+		if (questprogress(60123,HUNTING) != 2) {
 			mes "[Laertes]";
 			mes "Have you finished hunting the 50 Creamys?";
 			next;
@@ -94,8 +94,8 @@ prt_fild04,356,148,3	script	Laertes#Creamy_Hunt	4_M_NFMAN,{
 			close;
 		}
 	}
-	if (checkquest(60124) != -1) {
-		if (checkquest(60124,HUNTING) != 2 ) {
+	if (questprogress(60124)) {
+		if (questprogress(60124,HUNTING) != 2) {
 			mes "[Laertes]";
 			mes "Have you finished hunting the 150 Creamys?";
 			next;
diff --git a/npc/pre-re/quests/collection/quest_demonpungus.txt b/npc/pre-re/quests/collection/quest_demonpungus.txt
index 242e7bca2..d72e3f816 100644
--- a/npc/pre-re/quests/collection/quest_demonpungus.txt
+++ b/npc/pre-re/quests/collection/quest_demonpungus.txt
@@ -13,8 +13,8 @@
 //============================================================
 
 ein_fild01,43,249,0	script	Local Villager#hunt	4_M_HUMAN_01,{
-	if (checkquest(60125) != -1) {
-		if (checkquest(60125,HUNTING) != 2 ) {
+	if (questprogress(60125)) {
+		if (questprogress(60125,HUNTING) != 2) {
 			mes "[Local Villager]";
 			mes "Have you finished hunting the 50 Demon Pungus?";
 			next;
@@ -53,8 +53,8 @@ ein_fild01,43,249,0	script	Local Villager#hunt	4_M_HUMAN_01,{
 			close;
 		}
 	}
-	if (checkquest(60126) != -1) {
-		if (checkquest(60126,HUNTING) != 2 ) {
+	if (questprogress(60126)) {
+		if (questprogress(60126,HUNTING) != 2) {
 			mes "[Local Villager]";
 			mes "Have you finished hunting the 50 Demon Pungus?";
 			next;
@@ -94,8 +94,8 @@ ein_fild01,43,249,0	script	Local Villager#hunt	4_M_HUMAN_01,{
 			close;
 		}
 	}
-	if (checkquest(60127) != -1) {
-		if (checkquest(60127,HUNTING) != 2 ) {
+	if (questprogress(60127)) {
+		if (questprogress(60127,HUNTING) != 2) {
 			mes "[Local Villager]";
 			mes "Have you finished hunting the 150 Demon Pungus?";
 			next;
diff --git a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt
index 35d48aef7..8ff2ebce3 100644
--- a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt
+++ b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt
@@ -13,8 +13,8 @@
 
 nif_fild02,332,327,4	script	Deadman	4_M_NFDEADMAN,{
 
-	if (checkquest(60173) != -1) {
-		if (checkquest(60173,HUNTING) != 2 ) {
+	if (questprogress(60173)) {
+		if (questprogress(60173,HUNTING) != 2) {
 			mes "[Deadman]";
 			mes "Have you finished hunting the 50 Disguise?";
 			next;
@@ -51,8 +51,8 @@ nif_fild02,332,327,4	script	Deadman	4_M_NFDEADMAN,{
 		erasequest 60173;
 		close;
 	}
-	if (checkquest(60176) != -1) {
-		if (checkquest(60176,HUNTING) != 2 ) {
+	if (questprogress(60176)) {
+		if (questprogress(60176,HUNTING) != 2) {
 			mes "[Deadman]";
 			mes "Have you finished hunting the 50 Loli Ruri?";
 			next;
diff --git a/npc/pre-re/quests/collection/quest_dokebi.txt b/npc/pre-re/quests/collection/quest_dokebi.txt
index 62f0ed45d..898c353cb 100644
--- a/npc/pre-re/quests/collection/quest_dokebi.txt
+++ b/npc/pre-re/quests/collection/quest_dokebi.txt
@@ -13,8 +13,8 @@
 //============================================================
 
 pay_fild10,108,357,5	script	Li#Dokebi_Hunt	4_F_01,{
-	if (checkquest(60128) != -1) {
-		if (checkquest(60128,HUNTING) != 2 ) {
+	if (questprogress(60128)) {
+		if (questprogress(60128,HUNTING) != 2) {
 			mes "[Li]";
 			mes "Have you finished hunting the 50 Dokebis?";
 			next;
@@ -53,8 +53,8 @@ pay_fild10,108,357,5	script	Li#Dokebi_Hunt	4_F_01,{
 			close;
 		}
 	}
-	if (checkquest(60129) != -1) {
-		if (checkquest(60129,HUNTING) != 2 ) {
+	if (questprogress(60129)) {
+		if (questprogress(60129,HUNTING) != 2) {
 			mes "[Li]";
 			mes "Have you finished hunting the 50 Dokebis?";
 			next;
@@ -94,8 +94,8 @@ pay_fild10,108,357,5	script	Li#Dokebi_Hunt	4_F_01,{
 			close;
 		}
 	}
-	if (checkquest(60130) != -1) {
-		if (checkquest(60130,HUNTING) != 2 ) {
+	if (questprogress(60130)) {
+		if (questprogress(60130,HUNTING) != 2) {
 			mes "[Li]";
 			mes "Have you finished hunting the 150 Dokebis?";
 			next;
diff --git a/npc/pre-re/quests/collection/quest_dryad.txt b/npc/pre-re/quests/collection/quest_dryad.txt
index 552a1096f..1b14307de 100644
--- a/npc/pre-re/quests/collection/quest_dryad.txt
+++ b/npc/pre-re/quests/collection/quest_dryad.txt
@@ -13,8 +13,8 @@
 //============================================================
 
 um_fild01,34,281,5	script	Lilla#Dryad_Hunt	4_F_07,{
-	if (checkquest(60131) != -1) {
-		if (checkquest(60131,HUNTING) != 2 ) {
+	if (questprogress(60131)) {
+		if (questprogress(60131,HUNTING) != 2) {
 			mes "[Lilla]";
 			mes "Have you finished hunting the 50 Dryads?";
 			next;
@@ -53,8 +53,8 @@ um_fild01,34,281,5	script	Lilla#Dryad_Hunt	4_F_07,{
 			close;
 		}
 	}
-	if (checkquest(60132) != -1) {
-		if (checkquest(60132,HUNTING) != 2 ) {
+	if (questprogress(60132)) {
+		if (questprogress(60132,HUNTING) != 2) {
 			mes "[Lilla]";
 			mes "Have you finished hunting the 50 Dryads?";
 			next;
@@ -94,8 +94,8 @@ um_fild01,34,281,5	script	Lilla#Dryad_Hunt	4_F_07,{
 			close;
 		}
 	}
-	if (checkquest(60133) != -1) {
-		if (checkquest(60133,HUNTING) != 2 ) {
+	if (questprogress(60133)) {
+		if (questprogress(60133,HUNTING) != 2) {
 			mes "[Lilla]";
 			mes "Have you finished hunting the 150 Dryads?";
 			next;
diff --git a/npc/pre-re/quests/collection/quest_fabre.txt b/npc/pre-re/quests/collection/quest_fabre.txt
index bd11cf8ae..5de7e74fd 100644
--- a/npc/pre-re/quests/collection/quest_fabre.txt
+++ b/npc/pre-re/quests/collection/quest_fabre.txt
@@ -13,8 +13,8 @@
 //============================================================
 
 gef_fild07,321,193,4	script	Langry#Fabre_Hunt	4_M_SAGE_A,{
-	if (checkquest(60107) != -1) {
-		if (checkquest(60107,HUNTING) != 2 ) {
+	if (questprogress(60107)) {
+		if (questprogress(60107,HUNTING) != 2) {
 			mes "[Langry]";
 			mes "Have you finished hunting the 50 Fabres?";
 			next;
@@ -53,8 +53,8 @@ gef_fild07,321,193,4	script	Langry#Fabre_Hunt	4_M_SAGE_A,{
 			close;
 		}
 	}
-	if (checkquest(60108) != -1) {
-		if (checkquest(60108,HUNTING) != 2 ) {
+	if (questprogress(60108)) {
+		if (questprogress(60108,HUNTING) != 2) {
 			mes "[Langry]";
 			mes "Have you finished hunting the 50 Fabres?";
 			next;
@@ -94,8 +94,8 @@ gef_fild07,321,193,4	script	Langry#Fabre_Hunt	4_M_SAGE_A,{
 			close;
 		}
 	}
-	if (checkquest(60109) != -1) {
-		if (checkquest(60109,HUNTING) != 2 ) {
+	if (questprogress(60109)) {
+		if (questprogress(60109,HUNTING) != 2) {
 			mes "[Langry]";
 			mes "Have you finished hunting the 150 Fabres?";
 			next;
diff --git a/npc/pre-re/quests/collection/quest_frilldora.txt b/npc/pre-re/quests/collection/quest_frilldora.txt
index 5c9321aa6..95ee22d3c 100644
--- a/npc/pre-re/quests/collection/quest_frilldora.txt
+++ b/npc/pre-re/quests/collection/quest_frilldora.txt
@@ -13,8 +13,8 @@
 //============================================================
 
 moc_fild17,66,273,5	script	Lemly#Frilldora_Hunt	4_F_JOB_ASSASSIN,{
-	if (checkquest(60134) != -1) {
-		if (checkquest(60134,HUNTING) != 2 ) {
+	if (questprogress(60134)) {
+		if (questprogress(60134,HUNTING) != 2) {
 			mes "[Lemly]";
 			mes "Have you finished hunting the 50 Frilldora?";
 			next;
@@ -53,8 +53,8 @@ moc_fild17,66,273,5	script	Lemly#Frilldora_Hunt	4_F_JOB_ASSASSIN,{
 			close;
 		}
 	}
-	if (checkquest(60135) != -1) {
-		if (checkquest(60135,HUNTING) != 2 ) {
+	if (questprogress(60135)) {
+		if (questprogress(60135,HUNTING) != 2) {
 			mes "[Lemly]";
 			mes "Have you finished hunting the 50 Frilldora?";
 			next;
@@ -94,8 +94,8 @@ moc_fild17,66,273,5	script	Lemly#Frilldora_Hunt	4_F_JOB_ASSASSIN,{
 			close;
 		}
 	}
-	if (checkquest(60136) != -1) {
-		if (checkquest(60136,HUNTING) != 2 ) {
+	if (questprogress(60136)) {
+		if (questprogress(60136,HUNTING) != 2) {
 			mes "[Lemly]";
 			mes "Have you finished hunting the 150 Frilldora?";
 			next;
diff --git a/npc/pre-re/quests/collection/quest_goat.txt b/npc/pre-re/quests/collection/quest_goat.txt
index 292a38459..ee5c33f54 100644
--- a/npc/pre-re/quests/collection/quest_goat.txt
+++ b/npc/pre-re/quests/collection/quest_goat.txt
@@ -13,8 +13,8 @@
 //============================================================
 
 ein_fild06,82,171,0	script	Vegetable Farmer#Goat	4_F_SHABBY,{
-	if (checkquest(60137) != -1) {
-		if (checkquest(60137,HUNTING) != 2 ) {
+	if (questprogress(60137)) {
+		if (questprogress(60137,HUNTING) != 2) {
 			mes "[Vegetable Farmer]";
 			mes "Have you finished hunting the 50 Goats?";
 			next;
@@ -53,8 +53,8 @@ ein_fild06,82,171,0	script	Vegetable Farmer#Goat	4_F_SHABBY,{
 			close;
 		}
 	}
-	if (checkquest(60138) != -1) {
-		if (checkquest(60138,HUNTING) != 2) {
+	if (questprogress(60138)) {
+		if (questprogress(60138,HUNTING) != 2) {
 			mes "[Vegetable Farmer]";
 			mes "Have you finished hunting the 100 Goats?";
 			next;
@@ -94,8 +94,8 @@ ein_fild06,82,171,0	script	Vegetable Farmer#Goat	4_F_SHABBY,{
 			close;
 		}
 	}
-	if (checkquest(60139) != -1) {
-		if (checkquest(60139,HUNTING) != 2) {
+	if (questprogress(60139)) {
+		if (questprogress(60139,HUNTING) != 2) {
 			mes "[Vegetable Farmer]";
 			mes "Have you finished hunting the 150 Goats?";
 			next;
diff --git a/npc/pre-re/quests/collection/quest_golem.txt b/npc/pre-re/quests/collection/quest_golem.txt
index 2c927ea40..8ad2d47b2 100644
--- a/npc/pre-re/quests/collection/quest_golem.txt
+++ b/npc/pre-re/quests/collection/quest_golem.txt
@@ -13,8 +13,8 @@
 //============================================================
 
 moc_fild11,57,138,0	script	Private Jeremy#hunt	4_M_MOC_SOLDIER,{
-	if (checkquest(60140) != -1) {
-		if (checkquest(60140,HUNTING) != 2 ) {
+	if (questprogress(60140)) {
+		if (questprogress(60140,HUNTING) != 2) {
 			mes "[Private Jeremy]";
 			mes "Have you finished hunting the 50 Golems?";
 			next;
@@ -53,8 +53,8 @@ moc_fild11,57,138,0	script	Private Jeremy#hunt	4_M_MOC_SOLDIER,{
 			close;
 		}
 	}
-	if (checkquest(60141) != -1) {
-		if (checkquest(60141,HUNTING) != 2 ) {
+	if (questprogress(60141)) {
+		if (questprogress(60141,HUNTING) != 2) {
 			mes "[Private Jeremy]";
 			mes "Have you finished hunting the 50 Golems?";
 			next;
@@ -94,8 +94,8 @@ moc_fild11,57,138,0	script	Private Jeremy#hunt	4_M_MOC_SOLDIER,{
 			close;
 		}
 	}
-	if (checkquest(60142) != -1) {
-		if (checkquest(60142,HUNTING) != 2 ) {
+	if (questprogress(60142)) {
+		if (questprogress(60142,HUNTING) != 2) {
 			mes "[Private Jeremy]";
 			mes "Have you finished hunting the 150 Golems?";
 			next;
diff --git a/npc/pre-re/quests/collection/quest_hode.txt b/npc/pre-re/quests/collection/quest_hode.txt
index c534448d4..050387859 100644
--- a/npc/pre-re/quests/collection/quest_hode.txt
+++ b/npc/pre-re/quests/collection/quest_hode.txt
@@ -13,8 +13,8 @@
 //============================================================
 
 moc_fild17,208,346,5	script	Shone#Hode_Hunt	4_M_MOC_SOLDIER,{
-	if (checkquest(60104) != -1) {
-		if (checkquest(60104,HUNTING) != 2 ) {
+	if (questprogress(60104)) {
+		if (questprogress(60104,HUNTING) != 2) {
 			mes "[Shone]";
 			mes "Have you finished hunting the 50 Hodes?";
 			next;
@@ -53,8 +53,8 @@ moc_fild17,208,346,5	script	Shone#Hode_Hunt	4_M_MOC_SOLDIER,{
 			close;
 		}
 	}
-	if (checkquest(60105) != -1) {
-		if (checkquest(60105,HUNTING) != 2 ) {
+	if (questprogress(60105)) {
+		if (questprogress(60105,HUNTING) != 2) {
 			mes "[Shone]";
 			mes "Have you finished hunting the 50 Hodes?";
 			next;
@@ -94,8 +94,8 @@ moc_fild17,208,346,5	script	Shone#Hode_Hunt	4_M_MOC_SOLDIER,{
 			close;
 		}
 	}
-	if (checkquest(60106) != -1) {
-		if (checkquest(60106,HUNTING) != 2 ) {
+	if (questprogress(60106)) {
+		if (questprogress(60106,HUNTING) != 2) {
 			mes "[Shone]";
 			mes "Have you finished hunting the 150 Hodes?";
 			next;
diff --git a/npc/pre-re/quests/collection/quest_leafcat.txt b/npc/pre-re/quests/collection/quest_leafcat.txt
index 185ff2067..04b816322 100644
--- a/npc/pre-re/quests/collection/quest_leafcat.txt
+++ b/npc/pre-re/quests/collection/quest_leafcat.txt
@@ -13,8 +13,8 @@
 //============================================================
 
 ayo_fild01,44,241,5	script	Lella#LeafCat_Hunt	4_F_YUNYANG,{
-	if (checkquest(60143) != -1) {
-		if (checkquest(60143,HUNTING) != 2 ) {
+	if (questprogress(60143)) {
+		if (questprogress(60143,HUNTING) != 2) {
 			mes "[Lella]";
 			mes "Have you finished hunting the 50 Leaf Cats?";
 			next;
@@ -53,8 +53,8 @@ ayo_fild01,44,241,5	script	Lella#LeafCat_Hunt	4_F_YUNYANG,{
 			close;
 		}
 	}
-	if (checkquest(60144) != -1) {
-		if (checkquest(60144,HUNTING) != 2 ) {
+	if (questprogress(60144)) {
+		if (questprogress(60144,HUNTING) != 2) {
 			mes "[Lella]";
 			mes "Have you finished hunting the 50 Leaf Cats?";
 			next;
@@ -94,8 +94,8 @@ ayo_fild01,44,241,5	script	Lella#LeafCat_Hunt	4_F_YUNYANG,{
 			close;
 		}
 	}
-	if (checkquest(60145) != -1) {
-		if (checkquest(60145,HUNTING) != 2 ) {
+	if (questprogress(60145)) {
+		if (questprogress(60145,HUNTING) != 2) {
 			mes "[Lella]";
 			mes "Have you finished hunting the 150 Leaf Cats?";
 			next;
diff --git a/npc/pre-re/quests/collection/quest_mantis.txt b/npc/pre-re/quests/collection/quest_mantis.txt
index 3eb18ca4f..622f49538 100644
--- a/npc/pre-re/quests/collection/quest_mantis.txt
+++ b/npc/pre-re/quests/collection/quest_mantis.txt
@@ -13,8 +13,8 @@
 
 lou_fild01,240,354,4	script	Mantis Researcher	4_M_OILMAN,{
 
-	if (checkquest(60179) != -1) {
-		if (checkquest(60179,HUNTING) != 2 ) {
+	if (questprogress(60179)) {
+		if (questprogress(60179,HUNTING) != 2) {
 			mes "[Mantis Researcher]";
 			mes "Have you finished hunting the 50 Mantis?";
 			next;
diff --git a/npc/pre-re/quests/collection/quest_pecopeco.txt b/npc/pre-re/quests/collection/quest_pecopeco.txt
index 3460320ce..60f888f00 100644
--- a/npc/pre-re/quests/collection/quest_pecopeco.txt
+++ b/npc/pre-re/quests/collection/quest_pecopeco.txt
@@ -13,8 +13,8 @@
 //============================================================
 
 moc_fild02,74,329,3	script	Gregor#PecoPeco_Hunt	4W_M_01,{
-	if (checkquest(60101) != -1) {
-		if (checkquest(60101,HUNTING) != 2 ) {
+	if (questprogress(60101)) {
+		if (questprogress(60101,HUNTING) != 2) {
 			mes "[Gregor]";
 			mes "Have you finished hunting the 50 Peco Pecos?";
 			next;
@@ -54,8 +54,8 @@ moc_fild02,74,329,3	script	Gregor#PecoPeco_Hunt	4W_M_01,{
 			close;
 		}
 	}
-	if (checkquest(60102) != -1) {
-		if (checkquest(60102,HUNTING) != 2 ) {
+	if (questprogress(60102)) {
+		if (questprogress(60102,HUNTING) != 2) {
 			mes "[Gregor]";
 			mes "Have you finished hunting the 50 Peco Pecos?";
 			next;
@@ -96,8 +96,8 @@ moc_fild02,74,329,3	script	Gregor#PecoPeco_Hunt	4W_M_01,{
 			close;
 		}
 	}
-	if (checkquest(60103) != -1) {
-		if (checkquest(60103,HUNTING) != 2 ) {
+	if (questprogress(60103)) {
+		if (questprogress(60103,HUNTING) != 2) {
 			mes "[Gregor]";
 			mes "Have you finished hunting the 150 Peco Pecos?";
 			next;
diff --git a/npc/pre-re/quests/collection/quest_pupa.txt b/npc/pre-re/quests/collection/quest_pupa.txt
index 64aafe42f..ec38c275a 100644
--- a/npc/pre-re/quests/collection/quest_pupa.txt
+++ b/npc/pre-re/quests/collection/quest_pupa.txt
@@ -13,8 +13,8 @@
 //============================================================
 
 gef_fild04,191,54,3	script	Halgus#Pupa_Hunt	2_F_MAGICMASTER,{
-	if (checkquest(60110) != -1) {
-		if (checkquest(60110,HUNTING) != 2 ) {
+	if (questprogress(60110)) {
+		if (questprogress(60110,HUNTING) != 2) {
 			mes "[Halgus]";
 			mes "Have you gotten rid of the Pupa?";
 			next;
@@ -54,8 +54,8 @@ gef_fild04,191,54,3	script	Halgus#Pupa_Hunt	2_F_MAGICMASTER,{
 			close;
 		}
 	}
-	if (checkquest(60111) != -1) {
-		if (checkquest(60111,HUNTING) != 2 ) {
+	if (questprogress(60111)) {
+		if (questprogress(60111,HUNTING) != 2) {
 			mes "[Halgus]";
 			mes "Have you gotten rid of the Pupa?";
 			next;
@@ -96,8 +96,8 @@ gef_fild04,191,54,3	script	Halgus#Pupa_Hunt	2_F_MAGICMASTER,{
 			close;
 		}
 	}
-	if (checkquest(60112) != -1) {
-		if (checkquest(60112,HUNTING) != 2 ) {
+	if (questprogress(60112)) {
+		if (questprogress(60112,HUNTING) != 2) {
 			mes "[Halgus]";
 			mes "Have you gotten rid of the Pupa?";
 			next;
diff --git a/npc/pre-re/quests/collection/quest_zhupolong.txt b/npc/pre-re/quests/collection/quest_zhupolong.txt
index a167ec3e5..3d908c398 100644
--- a/npc/pre-re/quests/collection/quest_zhupolong.txt
+++ b/npc/pre-re/quests/collection/quest_zhupolong.txt
@@ -13,8 +13,8 @@
 
 lou_dun02,161,264,4	script	Dragon Hunter	4_M_JOB_HUNTER,{
 
-	if (checkquest(60182) != -1) {
-		if (checkquest(60182,HUNTING) != 2 ) {
+	if (questprogress(60182)) {
+		if (questprogress(60182,HUNTING) != 2) {
 			mes "[Dragon Hunter]";
 			mes "Have you finished hunting the 50 Zhu Po Long?";
 			next;