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

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

1 files changed, 109 insertions, 103 deletions

diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt
index 617ccf2c7..c64dd5230 100644
--- a/npc/re/quests/quests_malaya.txt
+++ b/npc/re/quests/quests_malaya.txt
@@ -70,8 +70,8 @@ malaya,266,76,3	script	Rodel the Guard#malaya	4_MAL_SOLDIER,4,4,{
 			mes "I was thinking of giving you the extermination mission that's being carried out in the city. What a shame. ";
 			close;
 		}
-		.@playtime = checkquest(7405, PLAYTIME);
-		if (.@playtime == 0) {
+		.@playtime = questprogress(7405, PLAYTIME);
+		if (!.@playtime) {
 			mes "[Rodel the Guard]";
 			mes "Whew, thanks to you, I have one less thing to worry about.";
 			mes "I will lose less of my things.";
@@ -93,8 +93,8 @@ malaya,266,76,3	script	Rodel the Guard#malaya	4_MAL_SOLDIER,4,4,{
 			mes "Come and find me when you decide.";
 			close;
 		} else {
-			.@hunting = checkquest(7404, HUNTING);
-			if (.@hunting == -1) {
+			.@hunting = questprogress(7404, HUNTING);
+			if (!.@hunting) {
 				mes "[Rodel the Guard]";
 				switch(rand(1, 6)) {
 				case 1:
@@ -133,7 +133,7 @@ malaya,266,76,3	script	Rodel the Guard#malaya	4_MAL_SOLDIER,4,4,{
 				mes "It would be a simple task for you.";
 				setquest 7404;
 				close;
-			} else if (.@hunting == 0) {
+			} else if (.@hunting == 0) { // FIXME
 				mes "[Rodel the Guard]";
 				mes "You have to get rid of 20 Jejelings.";
 				mes "20 should be enough to give those Jejelings a good scare.";
@@ -259,7 +259,7 @@ malaya,185,358,3	script	Leader Phong in Mumbaki	4_BARYO_CHIEF,{
 		mes "Young friend. Your presence is welcomed anywhere.";
 		mes "The light from your pure soul will protect you from the darkness.";
 		set malaya_hi, 10;
-		if (checkquest(7350) > -1)
+		if (questprogress(7350))
 			erasequest 7350;
 		close;
 	} else if (malaya_hi == 10) {
@@ -487,7 +487,7 @@ malaya,185,358,3	script	Leader Phong in Mumbaki	4_BARYO_CHIEF,{
 				close;
 			}
 		case 2:
-			if (checkquest(7402) == -1) {
+			if (!questprogress(7402)) {
 				mes "[Phong in Mumbaki]";
 				mes "Who is the floral tribute for?";
 				mes "Don't tell me you're making one in advance cause you're lazy?";
@@ -643,8 +643,8 @@ malaya,169,350,5	script	Imelda#malaya	4_M_BRZ_JACI,{
 		setquest 7367;
 		close;
 	} else if (malaya_hi == 22) {
-		.@playtime = checkquest(7367, PLAYTIME);
-		if (.@playtime == 0 || .@playtime == 1) {
+		.@playtime = questprogress(7367, PLAYTIME);
+		if (.@playtime == 1) {
 			mes "Imelda is in ritual with a devout aura, compared to when she streamed invectives.";
 			mes "Better not disturb her.";
 			close;
@@ -720,7 +720,7 @@ malaya,169,350,5	script	Imelda#malaya	4_M_BRZ_JACI,{
 		next;
 		switch (select("I'll help you making Spiritual Protections.:Love and Spiritual Protection for all.")) {
 		case 1:
-			if (checkquest(7380) > -1) {
+			if (questprogress(7380)) {
 				if ((countitem(6501) < 6) || (countitem(6502) < 6) || (countitem(6500) < 6)) {
 					mes "[Imelda]";
 					mes "Materials for making a Spiritual Protection are";
@@ -749,8 +749,8 @@ malaya,169,350,5	script	Imelda#malaya	4_M_BRZ_JACI,{
 				getexp 200000,200000;
 				close;
 			} else {
-				.@playtime = checkquest(7381, PLAYTIME);
-				if ((.@playtime == 0) || (.@playtime == 1)) {
+				.@playtime = questprogress(7381, PLAYTIME);
+				if (.@playtime == 1) {
 					mes "[Imelda]";
 					mes "I appreciate your kindness, but we have enough for today.";
 					mes "I'll ask for you when I need more materials.";
@@ -789,8 +789,8 @@ malaya,169,350,5	script	Imelda#malaya	4_M_BRZ_JACI,{
 				}
 			}
 		case 2:
-			if (checkquest(7374) != -1) {
-				if (checkquest(7379) == -1) {
+			if (questprogress(7374)) {
+				if (!questprogress(7379)) {
 					mes "[Imelda]";
 					mes "Please deliver these new Spiritual Protections to the villagers.";
 					mes "You know them, right?";
@@ -819,8 +819,8 @@ malaya,169,350,5	script	Imelda#malaya	4_M_BRZ_JACI,{
 					$malayaNames$[0] = strcharinfo(0);
 				close;
 			} else {
-				.@playtime = checkquest(7375, PLAYTIME);
-				if (.@playtime == 0 || .@playtime == 1) {
+				.@playtime = questprogress(7375, PLAYTIME);
+				if (.@playtime == 1) {
 					mes "[Imelda]";
 					mes "The Spiritual Protections given before will still be in effect";
 					mes "It's okay for now.";
@@ -838,7 +838,7 @@ malaya,169,350,5	script	Imelda#malaya	4_M_BRZ_JACI,{
 						mes "Of course, you'll still encounter ghosts here and there.";
 						close;
 					}
-					if ((checkquest(7381) == 0) || (checkquest(7381) == 1)) {
+					if (questprogress(7381) == 1) {
 						mes "[Imelda]";
 						mes "Thank you very much.";
 						mes "Come back when you've given them all out.";
@@ -873,7 +873,7 @@ malaya,169,350,5	script	Imelda#malaya	4_M_BRZ_JACI,{
 						mes "Of course, you'll still encounter ghosts here and there.";
 						close;
 					}
-					if ((checkquest(7381, PLAYTIME) == 0) || (checkquest(7381, PLAYTIME) == 1)) {
+					if (questprogress(7381, PLAYTIME) == 1) {
 						mes "[Imelda]";
 						mes "Thank you very much.";
 						mes "Come back when you've given them all out.";
@@ -912,7 +912,7 @@ malaya,181,353,5	script	Old Man Nardo#malaya	4_M_BARYO_OLD,{
 		mes "Not from around here, I see. I have nothing to say.";
 		close;
 	} else if (malaya_hi == 10) {
-		if (checkquest(7353) == 2) {
+		if (questprogress(7353) == 2) {
 			mes "[Old Man Nardo]";
 			mes "How about lending a hand for a poor old man?";
 			mes "I don't care if it's just a sleeve of your shirt, just give me something with your vigor.";
@@ -937,7 +937,7 @@ malaya,181,353,5	script	Old Man Nardo#malaya	4_M_BARYO_OLD,{
 			mes "-The troubled villagers desire your belongings because you fend off the ghosts. -";
 			setquest 7353;
 			completequest 7353;
-			if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) {
+			if (questprogress(7352) + questprogress(7353) + questprogress(7354) + questprogress(7355) + questprogress(7356) + questprogress(7357) > 9) {
 				next;
 				mes "-So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki.-";
 				set malaya_hi, 11;
@@ -951,7 +951,7 @@ malaya,181,353,5	script	Old Man Nardo#malaya	4_M_BARYO_OLD,{
 		mes "Must counsel with Mumbaki first!";
 		close;
 	} else if (malaya_hi == 12) {
-		if (checkquest(7360) != -1) {
+		if (questprogress(7360)) {
 			mes "[Old Man Nardo]";
 			mes "To be honest, I do not believe that this Holy Artifact has any abilities.";
 			mes "It's just for the peace of mind.";
@@ -980,7 +980,8 @@ malaya,181,353,5	script	Old Man Nardo#malaya	4_M_BARYO_OLD,{
 		delitem 523, 1; //Holy_Water
 		setquest 7360;
 		completequest 7360;
-		if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) {
+		if (questprogress(7359) == 2 && questprogress(7360) == 2 && questprogress(7361) == 2
+		 && questprogress(7362) == 2 && questprogress(7363) == 2 && questprogress(7364) == 2) {
 			mes "-With the Old Man as last, enough Holy Artifacts have been given out.-";
 			set malaya_hi, 13;
 			erasequest 7351;
@@ -1032,7 +1033,7 @@ malaya,181,353,5	script	Old Man Nardo#malaya	4_M_BARYO_OLD,{
 			mes "Thank you.";
 			close;
 		case 2:
-			if ((checkquest(7374) != -1) && (checkquest(7369) != -1)) {
+			if (questprogress(7374) && questprogress(7369)) {
 				if (!countitem(6503)) {
 					mes "^4d4dffThere's no Spiritual Protection to give to the Old Man.^000000";
 					close;
@@ -1046,7 +1047,7 @@ malaya,181,353,5	script	Old Man Nardo#malaya	4_M_BARYO_OLD,{
 				delitem 6503, 1; // Soul_Protection
 				erasequest 7369;
 				setquest 7383;
-				if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) {
+				if (questprogress(7382) + questprogress(7383) + questprogress(7384) + questprogress(7385) + questprogress(7386) + questprogress(7387) > 5) {
 					mes "- With the Old Man as last, all Spiritual Protections have been delivered. Head back to Imelda.-";
 					if (malaya_hi == 23) {
 						set malaya_hi, 24;
@@ -1075,7 +1076,7 @@ malaya,181,353,5	script	Old Man Nardo#malaya	4_M_BARYO_OLD,{
 				mes "I'm sorry but I can't let you carry the precious Cast Iron Cauldron.";
 				close;
 			}
-			if ((checkquest(7378, PLAYTIME) == 0) || (checkquest(7378, PLAYTIME) == 1)) {
+			if (questprogress(7378, PLAYTIME) == 1) {
 				mes "[Old Man Nardo]";
 				mes "You've delivered the Cast Iron Cauldron to Baryo, so that's enough for today.";
 				mes "No matter how strong a cauldron is, even with the toughest cast iron, it only lasts a day.";
@@ -1083,7 +1084,7 @@ malaya,181,353,5	script	Old Man Nardo#malaya	4_M_BARYO_OLD,{
 				mes "[Old Man Nardo]";
 				mes "Help me out again tomorrow if you can.";
 				close;
-			} else if (checkquest(7378, PLAYTIME) == 2) {
+			} else if (questprogress(7378, PLAYTIME) == 2) {
 				mes "[Old Man Nardo]";
 				mes "Hey there!";
 				mes "So, are you well and well fed?";
@@ -1094,7 +1095,7 @@ malaya,181,353,5	script	Old Man Nardo#malaya	4_M_BARYO_OLD,{
 				erasequest 7378;
 				close;
 			 } else {
-				if (checkquest(7377) != -1) {
+				if (questprogress(7377)) {
 					if (countitem(6503) < 5) {
 						mes "[Old Man Nardo]";
 						mes "Did you deliver the cauldron in one piece?";
@@ -1121,7 +1122,7 @@ malaya,181,353,5	script	Old Man Nardo#malaya	4_M_BARYO_OLD,{
 						$malayaNames$[2] = strcharinfo(0);
 					close;
 				} else {
-					if (checkquest(7376) > -1) {
+					if (questprogress(7376)) {
 						mes "[Old Man Nardo]";
 						mes "Go to Kiko in Mumbaki at Baryo Mahiwaga and deliver the Cast Iron Cauldron.";
 						mes "This should help against the Bakonawa troubles.";
@@ -1176,7 +1177,7 @@ malaya,224,267,3	script	Romel#malaya	4_M_MAYOR,{
 		mes "(He evades your gaze and ignores you.)";
 		close;
 	} else if (malaya_hi == 10) {
-		if (checkquest(7357) == 2) {
+		if (questprogress(7357) == 2) {
 			mes "[Romel]";
 			mes "....So cold-hearted.";
 			mes "And here we are, always trembling in anxiety...";
@@ -1201,7 +1202,7 @@ malaya,224,267,3	script	Romel#malaya	4_M_MAYOR,{
 			mes "-The troubled villagers desire your belongings because you fend off the ghosts. -";
 			setquest 7357;
 			completequest 7357;
-			if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) {
+			if (questprogress(7352) + questprogress(7353) + questprogress(7354) + questprogress(7355) + questprogress(7356) + questprogress(7357) > 9) {
 				next;
 				mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki.-";
 				set malaya_hi, 11;
@@ -1214,7 +1215,7 @@ malaya,224,267,3	script	Romel#malaya	4_M_MAYOR,{
 		mes "He'll surely take a hair or pull a sleeve if he had his way!";
 		close;
 	} else if (malaya_hi == 12) {
-		if (checkquest(7364) != -1) {
+		if (questprogress(7364)) {
 			mes "[Romel]";
 			mes "Frankly speaking, it's for the peace of mind.";
 			mes "With it, I could face them with more boldness.";
@@ -1245,7 +1246,8 @@ malaya,224,267,3	script	Romel#malaya	4_M_MAYOR,{
 		delitem 523, 1; //Holy_Water
 		setquest 7364;
 		completequest 7364;
-		if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) {
+		if (questprogress(7359) == 2 && questprogress(7360) == 2 && questprogress(7361) == 2
+		 && questprogress(7362) == 2 && questprogress(7363) == 2 && questprogress(7364) == 2) {
 			mes "-With Romel as last, I think enough Holy Artifacts have been given.-";
 			set malaya_hi, 13;
 			erasequest 7351;
@@ -1286,7 +1288,7 @@ malaya,224,267,3	script	Romel#malaya	4_M_MAYOR,{
 			mes "I am at peace these days.";
 			close;
 		}
-		if ((checkquest(7374) == -1) || (checkquest(7373) == -1)) {
+		if (!questprogress(7374) || !questprogress(7373)) {
 			mes "[Romel]";
 			mes "A new Spiritual Protection?";
 			mes "The one you gave me before still works fine.";
@@ -1306,7 +1308,7 @@ malaya,224,267,3	script	Romel#malaya	4_M_MAYOR,{
 		delitem 6503, 1; // Soul_Protection
 		erasequest 7373;
 		setquest 7387;
-		if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) {
+		if (questprogress(7382) + questprogress(7383) + questprogress(7384) + questprogress(7385) + questprogress(7386) + questprogress(7387) > 5) {
 			mes "- With Romel as last, all Spiritual Protections have been delivered. Head back to Imelda.-";
 			if (malaya_hi == 23) {
 				set malaya_hi, 24;
@@ -1332,7 +1334,7 @@ malaya,223,267,5	script	Talah#malaya	4_F_DST_CHILD,{
 		mes "(When your eyes met with hers, she ran and hid behind her father.)";
 		close;
 	} else if (malaya_hi == 10) {
-		if (checkquest(7356) == 2) {
+		if (questprogress(7356) == 2) {
 			mes "[Talah]";
 			mes "Talah might be taken away tonight.";
 			mes "Scary kids might come to Talah.";
@@ -1355,7 +1357,7 @@ malaya,223,267,5	script	Talah#malaya	4_F_DST_CHILD,{
 			mes "- The troubled villagers desire your belongings because you fend off the ghosts. -";
 			setquest 7356;
 			completequest 7356;
-			if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) {
+			if (questprogress(7352) + questprogress(7353) + questprogress(7354) + questprogress(7355) + questprogress(7356) + questprogress(7357) > 9) {
 				next;
 				mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki. -";
 				set malaya_hi, 11;
@@ -1367,7 +1369,7 @@ malaya,223,267,5	script	Talah#malaya	4_F_DST_CHILD,{
 		mes "Talah looks from you to her father with inquisitive eyes.";
 		close;
 	} else if (malaya_hi == 12) {
-		if (checkquest(7363) != -1) {
+		if (questprogress(7363)) {
 			mes "[Talah]";
 			mes "I dont know for sure";
 			mes "but I get a warm feel from them.";
@@ -1393,7 +1395,8 @@ malaya,223,267,5	script	Talah#malaya	4_F_DST_CHILD,{
 		delitem 523, 1; //Holy_Water
 		setquest 7363;
 		completequest 7363;
-		if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) {
+		if (questprogress(7359) == 2 && questprogress(7360) == 2 && questprogress(7361) == 2
+		 && questprogress(7362) == 2 && questprogress(7363) == 2 && questprogress(7364) == 2) {
 			mes "-With Talah as last, I think enough Holy Artifacts have been given.-";
 			set malaya_hi, 13;
 			erasequest 7351;
@@ -1415,7 +1418,7 @@ malaya,223,267,5	script	Talah#malaya	4_F_DST_CHILD,{
 			mes "You're keeping us safe aren't you?";
 			close;
 		}
-		if ((checkquest(7374) != -1) && (checkquest(7372) != -1)) {
+		if (questprogress(7374) && questprogress(7372)) {
 			if (!countitem(6503)) {
 				mes "^4d4dffThere is no Spiritual Protection to give to Talah.^000000";
 				close;
@@ -1430,7 +1433,7 @@ malaya,223,267,5	script	Talah#malaya	4_F_DST_CHILD,{
 			delitem 6503, 1; // Soul_Protection
 			erasequest 7372;
 			setquest 7386;
-			if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) {
+			if (questprogress(7382) + questprogress(7383) + questprogress(7384) + questprogress(7385) + questprogress(7386) + questprogress(7387) > 5) {
 				mes "- With Talah as last, all Spiritual Protections have been delivered. Head back to Imelda. -";
 				if (malaya_hi == 23) {
 					set malaya_hi, 24;
@@ -1460,7 +1463,7 @@ malaya,62,274,0	script	Sand Trap#malaya	4_SOIL,{
 		mes "- Cannot proceed with the quest. You are carrying too many items. -";
 		close;
 	}
-	if ((checkquest(7366) == -1) && (checkquest(7380) == -1)) {
+	if (!questprogress(7366) && !questprogress(7380)) {
 		mes "A device to evaporate sea water is buried in the sand...";
 		close;
 	}
@@ -1494,7 +1497,7 @@ ma_fild01,178,206,0	script	Black Bamboo#malaya	CLEAR_NPC,4,4,{
 		mes "- Cannot proceed with the quest. You are carrying too many items. -";
 		close;
 	}
-	if ((checkquest(7366) == -1) && (checkquest(7380) == -1)) {
+	if (!questprogress(7366) && !questprogress(7380)) {
 		mes "There's a short and black bamboo tree.";
 		close;
 	}
@@ -1513,7 +1516,7 @@ ma_fild01,178,206,0	script	Black Bamboo#malaya	CLEAR_NPC,4,4,{
 	mes "I knew I could do this!";
 	close;
 OnTouch:
-	if ((checkquest(7366) != -1) || (checkquest(7380) != -1)) {
+	if (questprogress(7366) || questprogress(7380)) {
 		specialeffect EF_LEVEL99_4;
 	}
 	end;
@@ -1540,7 +1543,7 @@ malaya,295,171,3	script	Collection Dealer Woeon	4_M_MALAYA,{
 		mes "Go away. Shoo, leave!";
 		close;
 	} else if (malaya_hi == 10) {
-		if (checkquest(7355) == 2) {
+		if (questprogress(7355) == 2) {
 			mes "[Woeon]";
 			mes "Now, look here my friend...";
 			mes "This can all be solved by giving me a button.";
@@ -1564,7 +1567,7 @@ malaya,295,171,3	script	Collection Dealer Woeon	4_M_MALAYA,{
 			mes "- The troubled villagers desire your belongings because you fend off the ghosts. -";
 			setquest 7355;
 			completequest 7355;
-			if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) {
+			if (questprogress(7352) + questprogress(7353) + questprogress(7354) + questprogress(7355) + questprogress(7356) + questprogress(7357) > 9) {
 				next;
 				mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki.-";
 				set malaya_hi, 11;
@@ -1584,7 +1587,7 @@ malaya,295,171,3	script	Collection Dealer Woeon	4_M_MALAYA,{
 		mes "Cold hearted son of a...";
 		close;
 	} else if (malaya_hi == 12) {
-		if (checkquest(7362) != -1) {
+		if (questprogress(7362)) {
 			mes "[Woeon]";
 			mes "Hmm. Look at my hands.";
 			mes "Less shaky, eh?";
@@ -1618,7 +1621,8 @@ malaya,295,171,3	script	Collection Dealer Woeon	4_M_MALAYA,{
 		delitem 523, 1; //Holy_Water
 		setquest 7362;
 		completequest 7362;
-		if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) {
+		if (questprogress(7359) == 2 && questprogress(7360) == 2 && questprogress(7361) == 2
+		 && questprogress(7362) == 2 && questprogress(7363) == 2 && questprogress(7364) == 2) {
 			mes "-With Woeon as last, I think enough Holy Artifacts have been given.-";
 			set malaya_hi, 13;
 			erasequest 7351;
@@ -1636,7 +1640,7 @@ malaya,295,171,3	script	Collection Dealer Woeon	4_M_MALAYA,{
 		mes "Oh, hi there!";
 		next;
 		if (select("Give Spiritual Protection.:The Dealer and his Collection") == 1) {
-			if (((checkquest(7374) == 0) || (checkquest(7374) == 1)) && ((checkquest(7371) == 0) || (checkquest(7371) == 1))) {
+			if (questprogress(7374) == 1 && questprogress(7371) == 1) {
 				if (!countitem(6503)) {
 					mes "^4d4dffThere is no Spiritual Protection to give to Woeon.^000000";
 					close;
@@ -1650,7 +1654,7 @@ malaya,295,171,3	script	Collection Dealer Woeon	4_M_MALAYA,{
 				delitem 6503, 1; // Soul_Protection
 				erasequest 7371;
 				setquest 7385;
-				if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) {
+				if (questprogress(7382) + questprogress(7383) + questprogress(7384) + questprogress(7385) + questprogress(7386) + questprogress(7387) > 5) {
 					mes "-With Woeon as last, all Spiritual Protections have been delivered.-";
 					if (malaya_hi == 23) {
 						set malaya_hi, 24;
@@ -1683,13 +1687,13 @@ malaya,295,171,3	script	Collection Dealer Woeon	4_M_MALAYA,{
 				mes "I'll let you have at it once you're stronger, my friend!";
 				close;
 			}
-			if ((checkquest(7392, PLAYTIME) == 0) || (checkquest(7392, PLAYTIME) == 1)) {
+			if (questprogress(7392, PLAYTIME) == 1) {
 				mes "[Woeon]";
 				mes "Oh, the Jejellopy collecting?";
 				mes "I have enough for today.";
 				mes "Come back again tomorrow.";
 				close;
-			} else if (checkquest(7392, PLAYTIME) == 2) {
+			} else if (questprogress(7392, PLAYTIME) == 2) {
 				mes "[Woeon]";
 				mes "Oh, yes yes.";
 				mes "You're going to collect Jejellopy today as well?";
@@ -1708,7 +1712,7 @@ malaya,295,171,3	script	Collection Dealer Woeon	4_M_MALAYA,{
 				setquest 7391;
 				close;
 			} else {
-				if ((checkquest(7391) == 0) || (checkquest(7391) == 1)) {
+				if (questprogress(7391) == 1) {
 					if (countitem(6498) < 30) {
 						mes "[Woeon]";
 						mes "Hmm? I don't think you have enough.";
@@ -1777,7 +1781,7 @@ malaya,119,217,3	script	Blacksmith Pandoi	4_M_DEWBOY,{
 		mes "Go... Go away!";
 		close;
 	} else if (malaya_hi == 10) {
-		if (checkquest(7354) == 2) {
+		if (questprogress(7354) == 2) {
 			mes "[Pandoi]";
 			mes "Please..";
 			mes "Couldn't you help a guy out here, just for the sake of it?";
@@ -1806,7 +1810,7 @@ malaya,119,217,3	script	Blacksmith Pandoi	4_M_DEWBOY,{
 			mes "-The troubled villagers desire your belongings because you fend off the ghosts. -";
 			setquest 7354;
 			completequest 7354;
-			if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) {
+			if (questprogress(7352) + questprogress(7353) + questprogress(7354) + questprogress(7355) + questprogress(7356) + questprogress(7357) > 9) {
 				next;
 				mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki.-";
 				set malaya_hi, 11;
@@ -1826,7 +1830,7 @@ malaya,119,217,3	script	Blacksmith Pandoi	4_M_DEWBOY,{
 		mes "Do you really think ignoring me is the best option?!";
 		close;
 	} else if (malaya_hi == 12) {
-		if (checkquest(7361) != -1) {
+		if (questprogress(7361)) {
 			mes "[Pandoi]";
 			mes "Now that I have confidence, the only thing left for me to do is charge to the hospital or field for material!";
 			mes "Bu... But, I'm too scared...";
@@ -1850,7 +1854,8 @@ malaya,119,217,3	script	Blacksmith Pandoi	4_M_DEWBOY,{
 		delitem 523, 1; //Holy_Water
 		setquest 7361;
 		completequest 7361;
-		if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) {
+		if (questprogress(7359) == 2 && questprogress(7360) == 2 && questprogress(7361) == 2
+		 && questprogress(7362) == 2 && questprogress(7363) == 2 && questprogress(7364) == 2) {
 			mes "-With Pandoi as last, I think I've given enough Holy Artifacts.-";
 			set malaya_hi, 13;
 			erasequest 7351;
@@ -1887,7 +1892,7 @@ malaya,119,217,3	script	Blacksmith Pandoi	4_M_DEWBOY,{
 		next;
 		switch (select("Give Spiritual Protection.:Silver Blade.:Silver Cross")) {
 		case 1:
-			if ((checkquest(7374) == -1) || (checkquest(7370) == -1)) {
+			if (!questprogress(7374) || !questprogress(7370)) {
 				mes "[Pandoi]";
 				mes "I appreciate you taking care of the expiration dates of my Spiritual Protection.";
 				mes "I think mine's good for now. ";
@@ -1906,7 +1911,7 @@ malaya,119,217,3	script	Blacksmith Pandoi	4_M_DEWBOY,{
 			delitem 6503, 1; // Soul_Protection
 			erasequest 7370;
 			setquest 7384;
-			if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) {
+			if (questprogress(7382) + questprogress(7383) + questprogress(7384) + questprogress(7385) + questprogress(7386) + questprogress(7387) > 5) {
 				mes "-With Pandoi as last, all Spiritual Protections have been delivered.-";
 				if (malaya_hi == 23) {
 					set malaya_hi, 24;
@@ -1932,7 +1937,7 @@ malaya,119,217,3	script	Blacksmith Pandoi	4_M_DEWBOY,{
 				mes "If you go in there like that... You'll never make it out alive!";
 				close;
 			}
-			.@hunting = checkquest(7393, HUNTING);
+			.@hunting = questprogress(7393, HUNTING);
 			if (.@hunting == 2) {
 				if (countitem(6508) < 10) {
 					mes "[Pandoi]";
@@ -1968,7 +1973,7 @@ malaya,119,217,3	script	Blacksmith Pandoi	4_M_DEWBOY,{
 				if (!rand(3))
 					$malayaNames$[1] = strcharinfo(0);
 				close;
-			} else if (.@hunting == 0 || .@hunting == 1) {
+			} else if (.@hunting == 1) {
 				mes "[Pandoi]";
 				mes "The village hospital holds the most hideous things inside.";
 				mes "I'm not sure what exactly... Whatever's in there, I'm not willing to go near it...";
@@ -1978,8 +1983,8 @@ malaya,119,217,3	script	Blacksmith Pandoi	4_M_DEWBOY,{
 				mes "You're the only one I can trust!";
 				close;
 			} else {
-				.@playtime = checkquest(7394, PLAYTIME);
-				if (.@playtime == 0 || .@playtime == 1) {
+				.@playtime = questprogress(7394, PLAYTIME);
+				if (.@playtime == 1) {
 					mes "[Pandoi]";
 					mes "I still have some silver to smelt.";
 					mes "I'll request more if I fail again.";
@@ -2125,7 +2130,7 @@ malaya,326,68,2	script	Pedro the Sailor	4W_SAILOR,{
 		mes "I'm seeing ghosts. I think it's my time to die.";
 		close;
 	} else if (malaya_hi == 10) {
-		if (checkquest(7352) == 2) {
+		if (questprogress(7352) == 2) {
 			mes "- Pedro the Sailor seems to have given up, but he can't take his gaze off of me.-";
 			close;
 		}
@@ -2168,7 +2173,7 @@ malaya,326,68,2	script	Pedro the Sailor	4W_SAILOR,{
 		mes "- Pedro the Sailor seems to have given up, but he can't take his gaze off of me.-";
 		setquest 7352;
 		completequest 7352;
-		if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) {
+		if (questprogress(7352) + questprogress(7353) + questprogress(7354) + questprogress(7355) + questprogress(7356) + questprogress(7357) > 9) {
 			next;
 			mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki. -";
 			set malaya_hi, 11;
@@ -2181,7 +2186,7 @@ malaya,326,68,2	script	Pedro the Sailor	4W_SAILOR,{
 		mes "This is so awkward.";
 		close;
 	} else if (malaya_hi == 12) {
-		if (checkquest(7359) != -1) {
+		if (questprogress(7359)) {
 			mes "[Pedro the Sailor]";
 			mes "Anyway, now that I have what they hate...";
 			mes "Now's the time to charge into my ship...!";
@@ -2208,7 +2213,8 @@ malaya,326,68,2	script	Pedro the Sailor	4W_SAILOR,{
 		delitem 523, 1; //Holy_Water
 		setquest 7359;
 		completequest 7359;
-		if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) {
+		if (questprogress(7359) == 2 && questprogress(7360) == 2 && questprogress(7361) == 2
+		 && questprogress(7362) == 2 && questprogress(7363) == 2 && questprogress(7364) == 2) {
 			mes "-With Pedro the Sailor as last, I think I gave enough Holy Artifacts.-";
 			set malaya_hi, 13;
 			erasequest 7351;
@@ -2229,7 +2235,7 @@ malaya,326,68,2	script	Pedro the Sailor	4W_SAILOR,{
 		mes "Well, living the dream, eh?";
 		next;
 		if (select("Give Spiritual Protection.:About the Ferry Ride") == 1) {
-			if ((checkquest(7374) == -1) || (checkquest(7368) == -1)) {
+			if (!questprogress(7374) || !questprogress(7368)) {
 				mes "[Pedro the Sailor]";
 				mes "The Spiritual Protection you gave me before works fine.";
 				mes "I'm good for now.";
@@ -2248,7 +2254,7 @@ malaya,326,68,2	script	Pedro the Sailor	4W_SAILOR,{
 			delitem 6503, 1; // Soul_Protection
 			erasequest 7368;
 			setquest 7382;
-			if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) {
+			if (questprogress(7382) + questprogress(7383) + questprogress(7384) + questprogress(7385) + questprogress(7386) + questprogress(7387) > 5) {
 				mes "-With Pedro the Sailor as last, all Spiritual Protections have been delivered.-";
 				if (malaya_hi == 23) {
 					set malaya_hi, 24;
@@ -2381,8 +2387,8 @@ malaya,326,68,2	script	Pedro the Sailor	4W_SAILOR,{
 				$malayaNames$[0] = strcharinfo(0);
 			close;
 		} else {
-			.@playtime = checkquest(7401, PLAYTIME);
-			if (.@playtime == 0 || .@playtime == 1) {
+			.@playtime = questprogress(7401, PLAYTIME);
+			if (.@playtime == 1) {
 				mes "[Pedro the Sailor]";
 				mes "If you want to go to Alberta, use the big ship over there.";
 				mes "This little one goes to Izlude.";
@@ -2412,8 +2418,8 @@ malaya,326,68,2	script	Pedro the Sailor	4W_SAILOR,{
 				erasequest 7401;
 				goto L_SetQuest;
 			} else {
-				if (checkquest(7403) == -1) {
-					if (checkquest(7402) == -1) {
+				if (!questprogress(7403)) {
+					if (!questprogress(7402)) {
 						goto L_SetQuest;
 					}
 					mes "[Pedro the Sailor]";
@@ -2630,9 +2636,9 @@ OnTouch:
 		mes "If they bother me again, however, I won't be.";
 		close;
 	} else {
-		if (checkquest(7402) == -1) {
-			if (checkquest(7403) == -1) {
-				if ((checkquest(7401, PLAYTIME) == 0) || (checkquest(7401, PLAYTIME) == 1)) {
+		if (!questprogress(7402)) {
+			if (!questprogress(7403)) {
+				if (questprogress(7401, PLAYTIME) == 1) {
 					cutin "malaya_diwata02", 2;
 					mes "[Diwata]";
 					mes "Surprisingly enough, I'm doing fine.";
@@ -2733,8 +2739,8 @@ ma_fild01,261,208,2	script	Kiko in Mumbaki	4_BARYO_CHIEF,{
 	next;
 	switch (select("Give Cast-Iron Caldron.:Request Purification Ritual.:Exchange Jellopy for gold.")) {
 		case 1:
-			if (checkquest(7376) == -1) {
-				if (checkquest(7377) == -1) {
+			if (!questprogress(7376)) {
+				if (!questprogress(7377)) {
 					mes "[Kiko in Mumbaki]";
 					mes "What cauldron?";
 					mes "As far as I know, you're not the one bringing it.";
@@ -2779,8 +2785,8 @@ ma_fild01,261,208,2	script	Kiko in Mumbaki	4_BARYO_CHIEF,{
 			erasequest 7376;
 			close;
 		case 2:
-			if (checkquest(7406) == -1) {
-				if (checkquest(7407) == -1) {
+			if (!questprogress(7406)) {
+				if (!questprogress(7407)) {
 					mes "[Kiko in Mumbaki]";
 					mes "The only purification needed in this village is Vantai's food.";
 					mes "There are no rituals where an outsider, like yourself, can take part in.";
@@ -2861,8 +2867,8 @@ ma_fild01,239,253,3	script	Dhong the Guard	4_MAL_SOLDIER,{
 		mes "Ha ha ha ha ha ha ha!";
 		close;
 	}
-	.@playtime = checkquest(7408, PLAYTIME);
-	if (.@playtime == 0 || .@playtime == 1) {
+	.@playtime = questprogress(7408, PLAYTIME);
+	if (.@playtime == 1) {
 		mes "[Dhong the Guard]";
 		mes "The bones you brought Vantai gave him a feast.";
 		mes "He'll be full and merry for a while now.";
@@ -2889,7 +2895,7 @@ ma_fild01,239,253,3	script	Dhong the Guard	4_MAL_SOLDIER,{
 		mes "for the hero to get us some Evil Spirit Bones from the forest.";
 		close;
 	} else {
-		if (checkquest(7406) != -1) {
+		if (questprogress(7406)) {
 			mes "[Dhong the Guard]";
 			mes "What I'm saying is that, to be a good guard dog, he must be able to stand ground against evil spirits.";
 			mes "For that he needs to eat Evil Spirit Bones, but it must be purified before he can eat them.";
@@ -2899,7 +2905,7 @@ ma_fild01,239,253,3	script	Dhong the Guard	4_MAL_SOLDIER,{
 			mes "Kiko in Mumbaki will purify them for you.";
 			close;
 		} else {
-			if (checkquest(7407) == 1) {
+			if (questprogress(7407) == 1) {
 				if (countitem(6505) < 10) {
 					mes "[Dhong the Guard]";
 					mes "Kiko in Mumbaki asked for 10 Purified Spirit Bones.";
@@ -2995,8 +3001,8 @@ ma_fild01,200,190,3	script	Maries#malaya	4_F_BARYO_WOMAN,{
 		mes "An anxious looking woman is stands.";
 		close;
 	}
-	.@playtime = checkquest(7390, PLAYTIME);
-	if (.@playtime == 0 || .@playtime == 1) {
+	.@playtime = questprogress(7390, PLAYTIME);
+	if (.@playtime == 1) {
 		mes "[Maries]";
 		mes "Now that the children know that they can get back home with an Inside-out Shirt,";
 		mes "they play out in the forest recklessly and timelessly.";
@@ -3012,7 +3018,7 @@ ma_fild01,200,190,3	script	Maries#malaya	4_F_BARYO_WOMAN,{
 		erasequest 7390;
 		close;
 	} else {
-		if (checkquest(7389) != -1) {
+		if (questprogress(7389)) {
 			mes "[Maries]";
 			mes "You came back.";
 			mes "Thanks to you, the child has returned home safely.";
@@ -3031,7 +3037,7 @@ ma_fild01,200,190,3	script	Maries#malaya	4_F_BARYO_WOMAN,{
 				$malayaNames$[2] = strcharinfo(0);
 			close;
 		} else {
-			if (checkquest(7388) != -1) {
+			if (questprogress(7388)) {
 				mes "[Maries]";
 				mes "I'm sure they're lost in the woods because of mischievous spirits.";
 				mes "Please give the child the ^4d4dffInside-out Shirt^000000 when found.";
@@ -3099,7 +3105,7 @@ ma_fild01,203,189,3	script	Little Girl#malaya	4_F_BARYO_GIRL,{
 }
 
 ma_fild01,251,93,3	script	Lost Child#malaya01	4_F_BARYO_GIRL,{
-	if (checkquest(7388) > -1) {
+	if (questprogress(7388)) {
 		if (!countitem(12700)) {
 			mes "[Little Kid]";
 			mes "Sigh. Are you lost too?";
@@ -3144,7 +3150,7 @@ ma_fild01,251,93,3	script	Lost Child#malaya01	4_F_BARYO_GIRL,{
 		}
 		end;
 	} else {
-		if (checkquest(7389) != -1) {
+		if (questprogress(7389)) {
 			mes "[Little Kid]";
 			mes "I want to play some more.";
 			mes "I can always go back with this shirt.";
@@ -3226,8 +3232,8 @@ ma_fild02,241,39,5	script	Good Capre Budidai	4_MAL_BUDIDAI,{
 			mes "We'll never make it.";
 			close;
 		}
-		.@playtime = checkquest(7410, PLAYTIME);
-		if (.@playtime == 0 || .@playtime == 1) {
+		.@playtime = questprogress(7410, PLAYTIME);
+		if (.@playtime == 1) {
 			mes "[Budidai]";
 			mes "Traveler, my friend!";
 			mes "Bongisungisu ran far far away.";
@@ -3243,8 +3249,8 @@ ma_fild02,241,39,5	script	Good Capre Budidai	4_MAL_BUDIDAI,{
 			mes "You won't turn you're back on a good Capre?";
 			close;
 		} else {
-			if (checkquest(7409) != -1) {
-				if (checkquest(7409, HUNTING) == 2) {
+			if (questprogress(7409)) {
+				if (questprogress(7409, HUNTING) == 2) {
 					mes "[Budidai]";
 					mes "Astonishing, wanderer!";
 					mes "I could hear the pitiful wails of Bongisungisu all the way from here!";
@@ -4642,8 +4648,8 @@ malaya,290,340,3	script	Guard Leader#buwaya	4_MAL_CAPTAIN,{
 		getexp 1000000, 600000;
 		completequest 2280;
 	} else {
-		set .@hunting, checkquest(2281,HUNTING);
-		if (.@hunting == -1) {
+		.@hunting = questprogress(2281,HUNTING);
+		if (!.@hunting) {
 			mes "[Guard Leader]";
 			mes "Hear Buwaya appeared from the depth of the Forest.";
 			mes "As everyone knows, all our manpower is dispatched to handle Bangungots servants attacking the hospital recently.";
@@ -4673,7 +4679,7 @@ malaya,290,340,3	script	Guard Leader#buwaya	4_MAL_CAPTAIN,{
 			mes "Keep this in mind and be cautious at all times.";
 			mes "I recommend asking trustful colleagues for help.";
 			setquest 2281;
-		} else if (.@hunting == 0 || .@hunting == 1) {
+		} else if (.@hunting == 1) {
 			mes "[Guard Leader]";
 			mes "How is it going with the Buwaya situation?";
 			next;
@@ -6150,7 +6156,7 @@ malaya,289,364,4	script	Young Fortune Teller	4_F_MALAYA,{
 			close;
 		}
 	} else if (malaya_bakona2 == 7) {
-		if (checkquest(1186,HUNTING) == 2) {
+		if (questprogress(1186,HUNTING) == 2) {
 			mes "[Young Fortune Teller]";
 			mes "It looks like you took care of ^FF0000Tikbalang^000000";
 			mes "well enough.";
@@ -6549,7 +6555,7 @@ sec_in02,10,16,5	script	Bakonawa Intro Helper	4_MASK_SMOKEY,{
 		set malaya_bakona1,0;
 		set malaya_bakona2,0;
 		for(set .@i,1174; .@i<=1193; set .@i,.@i+1) {
-			if (checkquest(.@i) > -1)
+			if (questprogress(.@i))
 				erasequest .@i;
 		}
 		close;
@@ -6558,7 +6564,7 @@ sec_in02,10,16,5	script	Bakonawa Intro Helper	4_MASK_SMOKEY,{
 		mes "Here you go!";
 		set malaya_bakona1,6;
 		for(set .@i,1174; .@i<=1178; set .@i,.@i+1) {
-			if (checkquest(.@i) > -1)
+			if (questprogress(.@i))
 				erasequest .@i;
 		}
 		setquest 1179;
@@ -6568,7 +6574,7 @@ sec_in02,10,16,5	script	Bakonawa Intro Helper	4_MASK_SMOKEY,{
 		mes "Here you go!";
 		set malaya_bakona2,0;
 		for(set .@i,1180; .@i<=1193; set .@i,.@i+1) {
-			if (checkquest(.@i) > -1)
+			if (questprogress(.@i))
 				erasequest .@i;
 		}
 		close;
@@ -6583,7 +6589,7 @@ sec_in02,10,16,5	script	Bakonawa Intro Helper	4_MASK_SMOKEY,{
 		set malaya_bakona2,8;
 		setquest 1187;
 		for(set .@i,1178; .@i<=1193; set .@i,.@i+1) {
-			if (checkquest(.@i) > -1)
+			if (questprogress(.@i))
 				erasequest .@i;
 		}
 		close;
@@ -6689,7 +6695,7 @@ function	script	F_Malaya_Nurse	{
 		callsub L_Warp, getarg(0), 1;
 	} else if (malaya_bang == 40) {
 		callsub L_Weight;
-		if (checkquest(11309,HUNTING) == 2) {
+		if (questprogress(11309,HUNTING) == 2) {
 			callsub L_Complete;
 			set malaya_bang,41;
 			completequest 11309;
@@ -6703,7 +6709,7 @@ function	script	F_Malaya_Nurse	{
 		}
 	} else if (malaya_bang > 40) {
 		if (malaya_bang == 42) {
-			if (checkquest(11309,HUNTING) == 2) {
+			if (questprogress(11309,HUNTING) == 2) {
 				callsub L_Complete;
 				set malaya_bang,41;
 				completequest 11309;