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

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

5 files changed, 39 insertions, 45 deletions

diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt
index e264bfdca..caf2f428d 100644
--- a/npc/re/jobs/3-2/genetic.txt
+++ b/npc/re/jobs/3-2/genetic.txt
@@ -390,12 +390,12 @@ job3_gen01,25,58,3	script	Devries#gen	4_LGTSCIENCE,{
 			mes "You can start from the beginning then?";
 			mes "Why are you asking me such things?";
 			set job_gen,7;
-			if (checkquest(2209) == 1) erasequest 2209;
-			if (checkquest(2210) == 1) erasequest 2210;
-			if (checkquest(2211) == 1) erasequest 2211;
-			if (checkquest(2212) == 1) erasequest 2212;
-			if (checkquest(2213) == 1) erasequest 2213;
-			if (checkquest(2214) == 1) erasequest 2214;
+			if (questprogress(2209) == 1) erasequest 2209;
+			if (questprogress(2210) == 1) erasequest 2210;
+			if (questprogress(2211) == 1) erasequest 2211;
+			if (questprogress(2212) == 1) erasequest 2212;
+			if (questprogress(2213) == 1) erasequest 2213;
+			if (questprogress(2214) == 1) erasequest 2214;
 			close;
 		}
 	} else if (job_gen == 60 || job_gen == 61) {
@@ -473,15 +473,15 @@ job3_gen01,25,58,3	script	Devries#gen	4_LGTSCIENCE,{
 				set job_gen,7;
 			}
 		}
-		if (checkquest(2209) == 1) erasequest 2209;
-		if (checkquest(2210) == 1) erasequest 2210;
-		if (checkquest(2211) == 1) erasequest 2211;
-		if (checkquest(2212) == 1) erasequest 2212;
-		if (checkquest(2213) == 1) erasequest 2213;
-		if (checkquest(2214) == 1) erasequest 2214;
+		if (questprogress(2209) == 1) erasequest 2209;
+		if (questprogress(2210) == 1) erasequest 2210;
+		if (questprogress(2211) == 1) erasequest 2211;
+		if (questprogress(2212) == 1) erasequest 2212;
+		if (questprogress(2213) == 1) erasequest 2213;
+		if (questprogress(2214) == 1) erasequest 2214;
 		close;
 	} else if (job_gen > 61 && job_gen < 76) {
-		if (checkquest(2223,HUNTING) == 2) {
+		if (questprogress(2223,HUNTING) == 2) {
 			mes "[Devries]";
 			mes "Oh, wait a second.";
 			mes "It seems that the mail's has arrived.";
@@ -642,7 +642,7 @@ job3_gen01,12,56,3	script	Plant Guide#generic	HIDDEN_NPC,{
 // QuestID,PlantName,Description{,Part?}
 function	script	Genetic_Job_Plant	{
 	if (job_gen == 7) {
-		if (checkquest(getarg(0)) == -1 || checkquest(getarg(0)) == 0) {
+		if (!questprogress(getarg(0))) {
 			mes "- "+getarg(2)+" -";
 			next;
 			switch(select("Use it as a material.:Do not use.")) {
@@ -699,12 +699,8 @@ job3_gen01,7,50,3	script	Testing Table#gen	CLEAR_NPC,{
 			mes "- It's not the time to start an experiment. -";
 			close;
 		}
-		if ((checkquest(2209) == -1 || checkquest(2209) == 0) &&
-		    (checkquest(2210) == -1 || checkquest(2210) == 0) &&
-		    (checkquest(2211) == -1 || checkquest(2211) == 0) &&
-		    (checkquest(2212) == -1 || checkquest(2212) == 0) &&
-		    (checkquest(2213) == -1 || checkquest(2213) == 0) &&
-		    (checkquest(2214) == -1 || checkquest(2214) == 0)) {
+		if (!questprogress(2209) && !questprogress(2210) && !questprogress(2211) && !questprogress(2212)
+		 && !questprogress(2213) && !questprogress(2213) && !questprogress(2214)) {
 			mes "["+strcharinfo(0)+"]";
 			mes "Hmm, I need to gather plant materials first.";
 			close;
@@ -731,16 +727,14 @@ job3_gen01,7,50,3	script	Testing Table#gen	CLEAR_NPC,{
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Good. Now I can let Miss Devries take a look at this seed!";
-		if ((checkquest(2209) == -1 || checkquest(2209) == 0) &&
-		    (checkquest(2210) == -1 || checkquest(2210) == 0) &&
-		    (checkquest(2211) == -1 || checkquest(2211) == 0)){
+		if (!questprogress(2209) && !questprogress(2210) && !questprogress(2211)) {
 			set job_gen,61;
 			getitem 6272,1; //Experiment_Seed
 			close;
 		}
-		if (checkquest(2209) == 1) set job_gen,job_gen+10;
-		if (checkquest(2210) == 1) set job_gen,job_gen+10;
-		if (checkquest(2211) == 1) set job_gen,job_gen+10;
+		if (questprogress(2209) == 1) set job_gen,job_gen+10;
+		if (questprogress(2210) == 1) set job_gen,job_gen+10;
+		if (questprogress(2211) == 1) set job_gen,job_gen+10;
 		set .@score, job_gen + JobLevel - 20;
 		if (rand(1,100) < .@score) {
 			set job_gen,60;
@@ -756,12 +750,12 @@ job3_gen01,7,50,3	script	Testing Table#gen	CLEAR_NPC,{
 		set job_gen,7;
 		if (countitem(6273)) delitem 6273,1; //Altered_Seed
 		if (countitem(6272)) delitem 6272,1; //Experiment_Seed
-		if (checkquest(2209) == 1) erasequest 2209;
-		if (checkquest(2210) == 1) erasequest 2210;
-		if (checkquest(2211) == 1) erasequest 2211;
-		if (checkquest(2212) == 1) erasequest 2212;
-		if (checkquest(2213) == 1) erasequest 2213;
-		if (checkquest(2214) == 1) erasequest 2214;
+		if (questprogress(2209) == 1) erasequest 2209;
+		if (questprogress(2210) == 1) erasequest 2210;
+		if (questprogress(2211) == 1) erasequest 2211;
+		if (questprogress(2212) == 1) erasequest 2212;
+		if (questprogress(2213) == 1) erasequest 2213;
+		if (questprogress(2214) == 1) erasequest 2214;
 		close;
 	} else if (job_gen == 60 || job_gen == 61) {
 		mes " - It looks like I need to let Miss Devries take a look at this seed! -";
@@ -920,7 +914,7 @@ job3_gen01,91,48,3	script	Demi Calberine#gen	4_F_SCIENCE,{
 		warp "job3_gen01",23,32;
 		end;
 	} else if (job_gen == 75) {
-		if (checkquest(2223,HUNTING) == 2) {
+		if (questprogress(2223,HUNTING) == 2) {
 			mes "It seem Miss Devries found out that I put you in her spore pen.";
 			mes "It's funny when you look at her face. After you've killed all those spores.";
 			close;
@@ -1017,7 +1011,7 @@ OnTouch:
 
 job3_gen01,24,32,0	script	The gaze of Devries	HIDDEN_WARP_NPC,2,2,{
 OnTouch:
-	if (checkquest(2223,HUNTING) == 2) {
+	if (questprogress(2223,HUNTING) == 2) {
 		mapannounce "job3_gen01","Devries: Whoa? Was there a lost kitty in the spore pen?",bc_map,"0x99CC00"; //FW_NORMAL 12 0 0
 		emotion e_omg,1;
 		warp "job3_gen01",21,38;
diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt
index a189d438d..be017920e 100644
--- a/npc/re/jobs/3-2/minstrel.txt
+++ b/npc/re/jobs/3-2/minstrel.txt
@@ -954,7 +954,7 @@ yuno,143,170,6	script	Mr. Click#job_min	4_M_ALCHE_A,{
 
 lighthalzen,155,119,3	script	Little girl#job_min	4_F_HUGIRL,3,3,{
 OnTouch:
-	if (checkquest(11145,HUNTING) == 2) {
+	if (questprogress(11145,HUNTING) == 2) {
 		if (job_min == 12) {
 			mes "[Little Girl]";
 			mes "Ah!!!!";
diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt
index d1c6ce75f..fc95e1dc4 100644
--- a/npc/re/jobs/3-2/shadow_chaser.txt
+++ b/npc/re/jobs/3-2/shadow_chaser.txt
@@ -1719,12 +1719,12 @@ tur_dun03,38,209,1	script	Blue Flame#sc_f01	4_NFWISP,{
 		mes "They seem to be related.";
 		set job_sha,6;
 		setquest 7164;
-		if (checkquest(7161) >= 0) erasequest 7161;
-		if (checkquest(7162) >= 0) erasequest 7162;
-		if (checkquest(7163) >= 0) erasequest 7163;
+		if (questprogress(7161)) erasequest 7161;
+		if (questprogress(7162)) erasequest 7162;
+		if (questprogress(7163)) erasequest 7163;
 		close;
 	} else if (job_sha == 6) {
-		if (checkquest(7164,HUNTING) == 2) {
+		if (questprogress(7164,HUNTING) == 2) {
 			mes "It looks like the blue flame is under the limitation.";
 			mes "You can't feel that rolling effect of a spell like before.";
 			next;
@@ -1787,7 +1787,7 @@ ice_dun02,206,223,1	script	Red Flame#sc_f02	4_NFWISP,{
 		setquest 7171;
 		close;
 	} else if (job_sha == 14 || job_sha == 15 || job_sha == 16) {
-		if (checkquest(7171,HUNTING) == 2) {
+		if (questprogress(7171,HUNTING) == 2) {
 			mes "You can't feel the soul from the flame.";
 			mes "When you go closer, you can't see well because of darkness.";
 			close2;
@@ -1894,7 +1894,7 @@ niflheim,230,276,1	script	Red Flame#sc_f03	4_NFWISP,{
 		setquest 7175;
 		close;
 	} else if (job_sha == 22) {
-		if (checkquest(7175,HUNTING) == 2) {
+		if (questprogress(7175,HUNTING) == 2) {
 			mes "You can't feel the soul from the flame.";
 			mes "When you go closer, you can't see well because of darkness.";
 			set job_sha,23;
diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt
index ce6aa152a..787c42e7a 100644
--- a/npc/re/jobs/3-2/sura.txt
+++ b/npc/re/jobs/3-2/sura.txt
@@ -377,7 +377,7 @@ ve_in,98,159,0	script	Fighter#job_shu	4_F_SURA,{
 			close;
 		}
 	} else if (job_shu == 3) {
-		if (checkquest(11156,HUNTING) == 2) {
+		if (questprogress(11156,HUNTING) == 2) {
 			mes "[???]";
 			mes "Wow~";
 			mes "Did you really kill all those wolves?";
diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt
index ae8cb109c..5a3319a62 100644
--- a/npc/re/jobs/3-2/wanderer.txt
+++ b/npc/re/jobs/3-2/wanderer.txt
@@ -770,8 +770,8 @@ hu_fild05,342,130,5	script	Dancer Kim#fild	4_F_CAPEGIRL,{
 		changequest 2220,2221;
 		close;
 	} else if (job_wan == 7) {
-		if (checkquest(2221,PLAYTIME) == 0 || checkquest(2221,PLAYTIME) == 1) {
-			if (checkquest(2221,HUNTING) == 2) {
+		if (questprogress(2221,PLAYTIME) == 1) {
+			if (questprogress(2221,HUNTING) == 2) {
 				mes "[Dancer Kim]";
 				mes "Whew!";
 				mes "Looks like I've lost!";
@@ -816,7 +816,7 @@ hu_fild05,342,130,5	script	Dancer Kim#fild	4_F_CAPEGIRL,{
 				mes "But I'm sure I have a better chance to win.";
 				close;
 			}
-		} else if (checkquest(2221,PLAYTIME) == 2) {
+		} else if (questprogress(2221,PLAYTIME) == 2) {
 			mes "[Dancer Kim]";
 			mes "Oh, you came back to me.";
 			mes "I'm so tired. I don't give up halfway. It's a good exercise for me. I will have to give up Nollio to another Wanderer, it's all over....";