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

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

2 files changed, 30 insertions, 30 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);
diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt
index 044e386fe..62facbdf9 100644
--- a/npc/re/jobs/novice/supernovice_ex.txt
+++ b/npc/re/jobs/novice/supernovice_ex.txt
@@ -58,7 +58,7 @@ function	script	Esseray_Ex	{
 }
 
 beach_dun2,119,92,4	script	Fishing Novice#sp2	4_M_SIT_NOVICE,{
-	if (checkquest(5092) >= 0) {
+	if (questprogress(5092)) {
 		mes "[Fishing Novice]";
 		mes "Sh --------- !!";
 		mes "Be quiet please.";
@@ -165,7 +165,7 @@ beach_dun2,119,92,4	script	Fishing Novice#sp2	4_M_SIT_NOVICE,{
 		mes "- Talk to him again. -";
 		close;
 	}
-	else if (checkquest(5093) >= 0) {
+	else if (questprogress(5093)) {
 		mes "[Nodor]";
 		mes "Emmhmm ----- !!";
 		next;
@@ -268,7 +268,7 @@ beach_dun2,119,92,4	script	Fishing Novice#sp2	4_M_SIT_NOVICE,{
 		mes "Don't come back until you've hunted 1,000.";
 		close;
 	}
-	else if (checkquest(5094) >= 0 || checkquest(5095) >= 0 || checkquest(5096) >= 0 || checkquest(5097) >= 0) {
+	else if (questprogress(5094) || questprogress(5095) || questprogress(5096) || questprogress(5097)) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Hey, Nodor!";
 		next;
@@ -277,7 +277,7 @@ beach_dun2,119,92,4	script	Fishing Novice#sp2	4_M_SIT_NOVICE,{
 		mes "Oh my god!";
 		mes "So frightened... let me see?";
 		next;
-		if (checkquest(5094,HUNTING) != 2 && checkquest(5095,HUNTING) != 2 && checkquest(5096,HUNTING) != 2 && checkquest(5097,HUNTING) != 2) {
+		if (questprogress(5094,HUNTING) != 2 && questprogress(5095,HUNTING) != 2 && questprogress(5096,HUNTING) != 2 && questprogress(5097,HUNTING) != 2) {
 			mes "[Nodor]";
 			mes "Hey! Super Novice!";
 			mes "Didn't I say to hunt 1,000?";
@@ -298,7 +298,7 @@ beach_dun2,119,92,4	script	Fishing Novice#sp2	4_M_SIT_NOVICE,{
 			mes "Don't tell a lie!! I will hit you!!";
 			close;
 		}
-		if (checkquest(5094+.@i,HUNTING) != 2) {
+		if (questprogress(5094+.@i,HUNTING) != 2) {
 			mes "[Nodor]";
 			mes "Don't tell a lie!";
 			mes "I didn't tell you to hunt this!";
@@ -321,7 +321,7 @@ beach_dun2,119,92,4	script	Fishing Novice#sp2	4_M_SIT_NOVICE,{
 		mes "I will let you know how to overcome your strength deficiencies.";
 		close;
 	}
-	else if (checkquest(5098) >= 0) {
+	else if (questprogress(5098)) {
 		if (rand(10) != 1) {
 			mes "[Nodor]";
 			mes "Oh! You already came here?";
@@ -377,7 +377,7 @@ beach_dun2,119,92,4	script	Fishing Novice#sp2	4_M_SIT_NOVICE,{
 		mes "You can give some to my bro. He's up in the airship.";
 		close;
 	}
-	else if (checkquest(5099) >= 0) {
+	else if (questprogress(5099)) {
 		mes "[Nodor]";
 		mes "Have you visited already?";
 		next;
@@ -392,7 +392,7 @@ beach_dun2,119,92,4	script	Fishing Novice#sp2	4_M_SIT_NOVICE,{
 		mes "10,000,000 zeny is okay~";
 		close;
 	}
-	else if (checkquest(5100) >= 0) {
+	else if (questprogress(5100)) {
 		if (EXSUPNOV_Q_ == 3) set .@str$,"300,000";
 		else if (EXSUPNOV_Q_ == 4) set .@str$,"1,000,000";
 		else set .@str$,"100,000";
@@ -588,7 +588,7 @@ beach_dun2,119,92,4	script	Fishing Novice#sp2	4_M_SIT_NOVICE,{
 }
 
 airplane,33,47,5	script	Nudor#sp2	4_F_NOVICE,{
-	if (checkquest(5099) >= 0) {
+	if (questprogress(5099)) {
 		mes "[Nudor]";
 		mes "Ahhh~ I have no money to buy any food.";
 		mes "I'm hungry, but I have no idea when Brother is coming...";
@@ -670,7 +670,7 @@ airplane,33,47,5	script	Nudor#sp2	4_F_NOVICE,{
 		mes "- tricked, so go back to Nodor. -";
 		close;
 	}
-	else if (checkquest(5100) >= 0) {
+	else if (questprogress(5100)) {
 		mes "[Nudor]";
 		mes "I cannot believe that my bro sent me money... I love it~";
 		next;