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

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

9 files changed, 124 insertions, 234 deletions

diff --git a/npc/quests/newgears/2008_headgears.txt b/npc/quests/newgears/2008_headgears.txt
index f45664f3b..e215b982a 100644
--- a/npc/quests/newgears/2008_headgears.txt
+++ b/npc/quests/newgears/2008_headgears.txt
@@ -103,7 +103,7 @@ gef_fild05,80,149,3	script	Myu#08_hat	4_F_YUNYANG,{
 			}
 		}
 	} else if(hatcat2008 == 1) {
-		if(checkquest(7055,HUNTING) == 2) {
+		if (questprogress(7055,HUNTING) == 2) {
 			mes "[Myu]";
 			mes "Did you think I didn't know what you have done?";
 			mes "Huh?";
@@ -120,7 +120,7 @@ gef_fild05,80,149,3	script	Myu#08_hat	4_F_YUNYANG,{
 			erasequest 7054;
 			erasequest 7055;
 			close;
-		} else if(checkquest(7054,HUNTING) == 2) {
+		} else if (questprogress(7054,HUNTING) == 2) {
 			mes "[Myu]";
 			mes "Oh..wow unbelievable!";
 			mes "Now, those Kobolds should have learned a lesson, haven't they?";
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 16860ddf2..a66038181 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -4145,7 +4145,7 @@ mid_camp,188,254,3	script	Monster Scholar#ep13	4_M_ALCHE_D,{
 			close;
 		}
 		else if (ep13_animal == 14) {
-			if (checkquest(2157,HUNTING) == 2) {
+			if (questprogress(2157,HUNTING) == 2) {
 				mes "[Rumis Block]";
 				mes "Welcome back. Did you find out about them?";
 				next;
@@ -4498,7 +4498,7 @@ mid_camp,240,270,3	script	Botanist#ep13	4_M_ALCHE_C,{
 			close;
 		}
 		else if (ep13_animal == 5) {
-			if (checkquest(2150,HUNTING) == 2) {
+			if (questprogress(2150,HUNTING) == 2) {
 				mes "[Botanist]";
 				mes "Welcome back! How was it?";
 				mes "It was amazing, wasn't it?";
@@ -4561,7 +4561,7 @@ mid_camp,240,270,3	script	Botanist#ep13	4_M_ALCHE_C,{
 			}
 		}
 		else if (ep13_animal == 6) {
-			if (checkquest(2151,HUNTING) == 2) {
+			if (questprogress(2151,HUNTING) == 2) {
 				mes "[Botanist]";
 				mes "Hopefully the Cornuses have learned their lesson, and won't touch my special environmental meters anymore.";
 				next;
@@ -4843,7 +4843,7 @@ man_fild01,92,230,3	script	Frozen Tree#evt_lumis	HIDDEN_NPC,1,1,{
 //============================================================
 spl_fild02,34,223,5	script	Small Fairy#spl	4_M_FAIRYKID,{
 	if (BaseLevel > 69) {
-		if (checkquest(2158) == -1) {
+		if (!questprogress(2158)) {
 			mes "You find a little creature flying in the bushes.";
 			mes "It has tiny wings on the back...";
 			mes "It's a fairy!";
@@ -4881,7 +4881,7 @@ spl_fild02,34,223,5	script	Small Fairy#spl	4_M_FAIRYKID,{
 
 man_fild03,236,105,3	script	Tree Giant#man	4_MAN_PIOM,{
 	if (BaseLevel > 69) {
-		if (checkquest(2159) == -1) {
+		if (!questprogress(2159)) {
 			mes "You have found something moving between dry branches.";
 			mes "It appears to be a tree at first glance, but it turns out to be a giant that is half tree and half man.";
 			next;
@@ -4923,14 +4923,14 @@ mid_camp,212,237,5	script	Camp Guard Captain#man1	4_M_EIN_SOLDIER,{
 	mes "working for United Midgard.";
 	mes "How may I help you?";
 	next;
-	if ((checkquest(2158) == 2) && (checkquest(2159) == 2)) {
+	if (questprogress(2158) == 2 && questprogress(2159) == 2) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Oh, nothing.";
 		mes "Sorry to bother you.";
 		close;
 	}
 	else {
-		if (checkquest(2158) == 1) {
+		if (questprogress(2158) == 1) {
 			mes "- You report your encounter with a small fairy in the Splandid area to the guard captain. -";
 			next;
 			mes "[Captain]";
@@ -4944,14 +4944,14 @@ mid_camp,212,237,5	script	Camp Guard Captain#man1	4_M_EIN_SOLDIER,{
 			getexp (checkre(3))?90000:900000,0;
 			close;
 		}
-		else if (checkquest(2158) == -1) {
+		else if (!questprogress(2158)) {
 			mes "["+strcharinfo(0)+"]";
 			mes "Oh, nothing.";
 			mes "Sorry to bother you.";
 			close;
 		}
 		else {
-			if (checkquest(2159) == 1) {
+			if (questprogress(2159) == 1) {
 				mes "- You report your encounter with a tree giant in the Manuk area to the guard captain. -";
 				next;
 				mes "[Captain]";
@@ -7393,8 +7393,8 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	4_M_DST_MASTER,{
 			}
 		}
 		else if (ep13_alba == 6) {
-			set .@alba_check,checkquest(7047,PLAYTIME);
-			if (.@alba_check == -1) {
+			.@alba_check = questprogress(7047,PLAYTIME);
+			if (!.@alba_check) {
 				mes "[Taab]";
 				mes "Thank you for";
 				mes "helping me last time.";
@@ -7406,7 +7406,7 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	4_M_DST_MASTER,{
 				set ep13_alba,0;
 				close;
 			}
-			else if ((.@alba_check == 0) || (.@alba_check == 1)) {
+			else if (.@alba_check == 1) {
 				mes "[Taab]";
 				mes "I've got enough feed";
 				mes "and supplies to last a while.";
@@ -8084,7 +8084,7 @@ mid_camp,72,94,4	script	Fluffy Gyaruk	4_M_BOSSCAT,{
 }
 
 mid_camp,69,144,0	script	Ferocious Gorurug	4_M_BOSSCAT,{
-	if (checkquest(12060,PLAYTIME) == -1) {
+	if (!questprogress(12060,PLAYTIME)) {
 		if (ep13_yong1 < 4) {
 			mes "[Ferocious Gorurug]";
 			mes "Grrr....";
@@ -8233,7 +8233,7 @@ mid_camp,69,144,0	script	Ferocious Gorurug	4_M_BOSSCAT,{
 			close;
 		}
 	}
-	else if ((checkquest(12060,PLAYTIME) == 0) || (checkquest(12060,PLAYTIME) == 1)) {
+	else if (questprogress(12060,PLAYTIME) == 1) {
 		mes "[Ferocious Gorurug]";
 		mes "*Yawn*";
 		mes "I'm sorry, but I'm off-duty.";
@@ -8252,7 +8252,7 @@ mid_camp,69,144,0	script	Ferocious Gorurug	4_M_BOSSCAT,{
 }
 
 spl_fild02,314,165,0	script	School of Fish#1::Fishinghole	CLEAR_NPC,{
-	if ((checkquest(12060,PLAYTIME) == -1) && (countitem(6039) < 20)) {
+	if (!questprogress(12060,PLAYTIME) && countitem(6039) < 20) {
 		specialeffect2 EF_BUBBLE;
 		specialeffect2 EF_INVENOM;
 		set .@fcast,15;
@@ -8368,7 +8368,7 @@ mid_camp,66,122,55	script	Henry Clifford	4_M_05,{
 }
 
 mid_camp,88,100,55	script	Cat Hand Mining Agent	4_CAT,{
-	if (checkquest(12062,PLAYTIME) == -1) {
+	if (!questprogress(12062,PLAYTIME) == -1) {
 		if ((countitem(6048) > 2) && (ep13_yong1 > 9)) {
 			mes "[Cat Hand Mining Agent]";
 			mes "Oh, wow~";
@@ -8403,7 +8403,7 @@ mid_camp,88,100,55	script	Cat Hand Mining Agent	4_CAT,{
 			close;
 		}
 	}
-	else if ((checkquest(12062,PLAYTIME) == 0) || (checkquest(12062,PLAYTIME) == 1)) {
+	else if (questprogress(12062,PLAYTIME) == 1) {
 		mes "[Cat Hand Mining Agent]";
 		mes "I hope you'll bring me minerals again tomorrow...";
 		mes "If you can. It's much better to wait for you to do it than go there on my own.";
@@ -8419,7 +8419,7 @@ mid_camp,88,100,55	script	Cat Hand Mining Agent	4_CAT,{
 }
 
 -	script	Mysterious Rock#0::manukrock	-1,{
-	if ((countitem(6048) < 3) && (checkquest(12062,PLAYTIME) == -1)) {
+	if (countitem(6048) < 3 && !questprogress(12062,PLAYTIME)) {
 		specialeffect2 EF_REPAIRWEAPON;
 		progressbar "ffff00",10;
 		set .@rhea_ran,rand(1,20);
@@ -10078,7 +10078,7 @@ man_fild01,315,95,3	script	Expedition Scout#1	4_M_MOC_SOLDIER,{
 	next;
 	mes "[Expedition Scout]";
 	mes "I've been ordered by Instructor Igrid to conduct a search for something.";
-	set .@playtime,checkquest(3091,PLAYTIME);
+	.@playtime = questprogress(3091,PLAYTIME);
 	next;
 	switch(select("Ask about search results.:Chitchat.:Quit.")) {
 	case 1:
@@ -10086,7 +10086,7 @@ man_fild01,315,95,3	script	Expedition Scout#1	4_M_MOC_SOLDIER,{
 			mes "[Expedition Scout]";
 			mes "Oh, you must be"+strcharinfo(0)+". I heard that you'll be delivering the report.";
 			next;
-			if (.@playtime == 0 || .@playtime == 1) {
+			if (.@playtime == 1) {
 				mes "[Expedition Scout]";
 				mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round.";
 				close;
@@ -10116,7 +10116,7 @@ man_fild01,315,95,3	script	Expedition Scout#1	4_M_MOC_SOLDIER,{
 					mes "I'm doing my best, but I haven't found any pages yet.";
 					next;
 				}
-				if (.@playtime == -1) {
+				if (!.@playtime) {
 					changequest 3090,3091;
 					erasequest 3090;
 				} else
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index f024c5285..45a35b73e 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -416,7 +416,7 @@ function Catwarp {
 man_fild02,132,47,4	duplicate(Cat Hand Agent#spl)	Cat Hand Agent#man	4_M_BOSSCAT
 
 -	script	Mysterious Rock#30::manukrock2	-1,{
-	if ((countitem(6048) < 3) && (checkquest(12062,PLAYTIME) == -1)) {
+	if (countitem(6048) < 3 && !questprogress(12062,PLAYTIME)) {
 		specialeffect2 EF_REPAIRWEAPON;
 		progressbar "ffff00",10;
 		set .@rhea_ran,rand(1,20);
@@ -456,7 +456,7 @@ man_fild02,358,174,0	duplicate(manukrock2)	Mysterious Rock#39	CLEAR_NPC
 man_fild02,241,227,0	duplicate(manukrock2)	Mysterious Rock#40	CLEAR_NPC
 
 spl_fild03,226,151,0	script	School of Fish#5::FishingHole_spl3	CLEAR_NPC,{
-	if ((checkquest(12060,PLAYTIME) == -1) && (countitem(6039) < 20)) {
+	if (!questprogress(12060,PLAYTIME) && countitem(6039) < 20) {
 		specialeffect2 EF_BUBBLE;
 		specialeffect2 EF_INVENOM;
 		set .@fcast,15;
@@ -2767,9 +2767,7 @@ manuk,252,116,3	script	Manuk Galtun#ep13_2day	4_MAN_GALTUN,{
 			}
 		}
 		else if (ep13_2_days01 == 1) {
-			set .@qst_cpl01,checkquest(7074,HUNTING);
-			set .@qst_cpl02,checkquest(7075,HUNTING);
-			if ((.@qst_cpl01 == 2) & (.@qst_cpl02 == 2)) {
+			if (questprogress(7074,HUNTING) == 2 && questprogress(7075,HUNTING) == 2) {
 				mes "[Strom]";
 				mes "Sure enough... I, the Sapha Galtun, Strom, apologize to you. I should not have been so quick to despise you.";
 				mes "I admit that you are a brave soldier, please feel free to visit Manuk.";
@@ -2829,10 +2827,8 @@ man_in01,378,276,3	script	Manuk Engineer#ep13_2	4_MAN_NITT,{
 		close;
 	}
 	if ((isequipped(2782) == 1) && (ep13_2_rhea > 99)) {
-		set .@alba,checkquest(7080);
-		if ((.@alba == 0) || (.@alba == 1)) {
-			set .@time_chek,checkquest(7080,PLAYTIME);
-			if (.@time_chek != 2) {
+		if (questprogress(7080) == 1) {
+			if (questprogress(7080,PLAYTIME) != 2) {
 				mes "[Manuk Engineer]";
 				mes "Thank you for collecting the Enriched Bradium for me, it was very helpful.";
 				mes "We've got more than enough for now though.";
@@ -2847,8 +2843,7 @@ man_in01,378,276,3	script	Manuk Engineer#ep13_2	4_MAN_NITT,{
 			}
 		}
 		else {
-			set .@alba2,checkquest(7079);
-			if ((.@alba2 == 0) || (.@alba2 == 1)) {
+			if (questprogress(7079) == 1) {
 				if (countitem(6090) > 19) {
 					mes "[Manuk Engineer]";
 					mes "Oh, that will do very well.";
@@ -2937,10 +2932,8 @@ spl_in01,97,313,3	script	Laphine Craftsman#ep13	4_M_FAIRYKID5,{
 	}
 	if ((isequipped(2782) == 1) && (ep13_2_rhea > 99)) {
 		if (ep13_mdrama > 5) {
-			set .@alba,checkquest(7082);
-			if (.@alba == 1) {
-				set .@time_chek,checkquest(7082,PLAYTIME);
-				if ((.@time_chek == 0) || (.@time_chek == 1)) {
+			if (questprogress(7082) == 1) {
+				if (questprogress(7082,PLAYTIME) == 1) {
 					mes "[Laphine craftsman]";
 					mes "Thank you for collecting those items for me.";
 					mes "That should be sufficient for the time being.";
@@ -2952,8 +2945,7 @@ spl_in01,97,313,3	script	Laphine Craftsman#ep13	4_M_FAIRYKID5,{
 				erasequest 7082;
 				close;
 			}
-			set .@alba2,checkquest(7081);
-			if ((.@alba2 == 0) || (.@alba2 == 1)) {
+			if (questprogress(7081) == 1) {
 				if ((countitem(7326) > 14) && (countitem(6075) > 14)) {
 					mes "[Laphine craftsman]";
 					mes "Oh, fantastic.";
@@ -3102,7 +3094,7 @@ mid_camp,146,306,3	script	Pet Breeder#ep13_eden01	4_F_SCIENCE,{
 	next;
 	if (select("Notice for criminal report:Cute pet investigation.") == 1) {
 		if (ep13_2_wanted == 1) {
-			if (checkquest(7076,HUNTING) == 2) {
+			if (questprogress(7076,HUNTING) == 2) {
 				mes "[Pinedel]";
 				mes "Have you hunted the Runaway Dandelion?";
 				mes "Ok, I accept you.";
@@ -3165,14 +3157,14 @@ mid_camp,146,306,3	script	Pet Breeder#ep13_eden01	4_F_SCIENCE,{
 		mes "[Pinedel]";
 		mes "Those eggs are about to hatch now.";
 		mes "I will investigate those back home.";
-		set .@alba_check,checkquest(7078,PLAYTIME);
-		if (.@alba_check == -1) {
+		.@alba_check = questprogress(7078,PLAYTIME);
+		if (!.@alba_check) {
 			close2;
 			erasequest 7078;
 			set ep13_2_dayegg,3;
 			end;
 		}
-		else if ((.@alba_check == 0) || (.@alba_check == 1)) {
+		else if (.@alba_check == 1) {
 			mes "For now I still need more time.";
 			next;
 			mes "[Pinedel]";
@@ -3638,8 +3630,7 @@ mid_camp,197,237,3	script	Schwartzvalt Mechanic#1	4_M_LGTMAN,{
 			close;
 		}
 		else if (ep13_2_rhea == 12) {
-			set .@trs_time01,checkquest(8253,PLAYTIME);
-			if (.@trs_time01 == 2) {
+			if (questprogress(8253,PLAYTIME) == 2) {
 				mes "[Mechanic Engineer Dorance]";
 				mes "Sigh, What should I do now?!";
 				next;
@@ -3814,9 +3805,7 @@ mid_campin,168,82,3	script	Arunafeltz Linguist#1	4_M_TRAINEE,{
 		mes "[Linguist Dictionary]";
 		mes "Have you met the other world's people by any chance?";
 		next;
-		set .@check_splque00,checkquest(2158);
-		set .@check_manque00,checkquest(2159);
-		if ((.@check_splque00 == 0) && (.@check_manque00 == 0)) {
+		if (!questprogress(2158) && !questprogress(2159)) {
 			// custom translation
 			mes "[Linguist Dictionary]";
 			mes "Looks like you haven't encountered them yet.";
@@ -3871,9 +3860,7 @@ mid_campin,168,82,3	script	Arunafeltz Linguist#1	4_M_TRAINEE,{
 		}
 	}
 	else if (ep13_2_rhea == 2) {
-		set .@check_splque00,checkquest(2158);
-		set .@check_manque00,checkquest(2159);
-		if ((.@check_splque00 > 0) && (.@check_manque00 > 0)) {
+		if (questprogress(2158) && questprogress(2159)) {
 			mes "[Linguist Dictionary]";
 			mes "You are back!";
 			next;
@@ -4256,9 +4243,7 @@ mid_camp,147,256,3	script	Rune Midgarts Magician#1	4_M_JOB_WIZARD,{
 		close;
 	}
 	else if (ep13_2_rhea == 5) {
-		set .@check_spljew00,checkquest(8241);
-		set .@check_manjew00,checkquest(8242);
-		if ((.@check_spljew00 > 0) && (.@check_manjew00 > 0)) {
+		if (questprogress(8241) && questprogress(8242)) {
 			if (countitem(7575) > 0) && (countitem(7576) > 0) {
 				mes "[Magician Whisper]";
 				mes "Wow, You are back already!";
@@ -4475,7 +4460,7 @@ function	script	jewel_13_2	{
 		close;
 	}
 	else if (ep13_2_rhea == 5) {
-		if (checkquest(8240+getarg(1)) == -1) {
+		if (!questprogress(8240+getarg(1))) {
 			mes "- Under a round pile of earth, -";
 			mes "- there's a "+getarg(0)+" Gem -";
 			mes "- half-buried. -";
@@ -4716,8 +4701,7 @@ man_in01,372,221,5	script	Scientist#lifeguard	4_MAN_BENKUNI,{
 				mes "Why not put some of your items in storage and come back?";
 				close;
 			}
-			set .@dayq_chk,checkquest(2182,PLAYTIME);
-			if ((.@dayq_chk == 0) || (.@dayq_chk == 1)) {
+			if (questprogress(2182,PLAYTIME) == 1) {
 				mes "The future of the Sapha is up to you.";
 				mes "I do not have any need of your help right now.";
 				close;
@@ -5465,8 +5449,8 @@ spl_in01,30,324,3	script	High Laphine#grenouille	4_M_FAIRYKID5,{
 			mes "Why not put some of your items in storage and come back?";
 			close;
 		}
-		set .@dayq_chk,checkquest(2186,PLAYTIME);
-		if ((.@dayq_chk == -1) || (.@dayq_chk == 2)) {
+		.@dayq_chk = questprogress(2186,PLAYTIME);
+		if (!.@dayq_chk || .@dayq_chk == 2) {
 			if ((ep13_2_tre1 < 1) || (ep13_2_tre1 == 6)) {
 				erasequest 2186;
 				set ep13_2_tre1,0;
diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index 1d2e61da3..a26c9c5f0 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -2493,8 +2493,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	4_M_KID1,{
 		close;
 	}
 	if (ep13_2_hiki == 10) {
-		set .@cooltime,checkquest(10087,PLAYTIME);
-		if (.@cooltime == 2) {
+		if (questprogress(10087,PLAYTIME) == 2) {
 			mes "[Iromo]";
 			mes "...You really are annoying...";
 			mes "What exactly do you want from me...?";
@@ -2581,8 +2580,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	4_M_KID1,{
 		close;
 	}
 	if ((ep13_2_hiki == 8) || (ep13_2_hiki == 9)) {
-		set .@cooltime,checkquest(10085,PLAYTIME);
-		if (.@cooltime == 2) {
+		if (questprogress(10085,PLAYTIME) == 2) {
 			mes "[Iromo]";
 			mes "You never give up, don't you?";
 			mes "What are you trying to say?";
@@ -2620,8 +2618,7 @@ alberta_in,131,95,5	script	Iromo#ep3_2	4_M_KID1,{
 		close;
 	}
 	if (ep13_2_hiki == 7) {
-		set .@goyang,checkquest(10084,HUNTING);
-		if (.@goyang == 2) {
+		if (questprogress(10084,HUNTING) == 2) {
 			mes "[Iromo]";
 			mes "Oh, you made the furious cat";
 			mes "go away from the village?";
@@ -2831,7 +2828,7 @@ alberta_in,120,93,3	script	Iromo's Mother#ep3_2	1_M_INNKEEPER,{
 	mes "But, somehow...";
 	mes "he doesn't go out anymore.";
 	next;
-	if (BaseLevel > 40 && checkquest(10079) == -1) {
+	if (BaseLevel > 40 && !questprogress(10079)) {
 		set ep13_2_hiki,1;
 		setquest 10079;
 	}
diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index 5a30866f7..2c3225ce2 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -160,7 +160,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	4_F_THAIAYO,2,2,{
 			mes "my ring. I'll be waiting";
 			mes "here for the good news.";
 			mes "Oho ho ho ho ho~!";
-			if (checkquest(12029) == -1)
+			if (!questprogress(12029))
 				setquest 12029;
 			close;
 		}
@@ -386,7 +386,7 @@ ayothaya,233,105,3	script	Powerful-Looking Woman	4_F_THAIAYO,2,2,{
 					next;
 					mes "[Shuda]";
 					mes "So go and look under the water! There's no water current, so I'm sure it's still there! What are you waiting for, it's should be an easy swim for you! Oho ho ho ho ho!";
-					if (checkquest(12029) == -1)
+					if (!questprogress(12029))
 						setquest 12029;
 					set thai_find,1;
 					close;
diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt
index 453a0e8fc..bab833ac0 100644
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -5781,8 +5781,8 @@ hu_in01,15,372,3	script	Cellette Lavit	1_F_MERCHANT_02,{
 		mes "is your Fish Cake Soup. Thank";
 		mes "you so much for your help~";
 		set hg_odeng,0;
-		for(set .@i,8072; .@i<= 8075; set .@i,.@i+1) {
-			if (checkquest(.@i) > -1)
+		for (.@i = 8072; .@i <= 8075; ++.@i) {
+			if (questprogress(.@i))
 				erasequest .@i;
 		}
 		getitem 584,3; //Fish_Ball_Soup
@@ -5833,8 +5833,8 @@ hugel,76,134,3	script	Neha	4W_F_01,{
 				mes "^FF00001 Whip^000000 so that I can spank you";
 				mes "for your impertinence, girl!";
 			}
-			for(set .@i,8064; .@i<= 8067; set .@i,.@i+1) {
-				if (checkquest(.@i) > -1 && checkquest(.@i) < 2)
+			for (.@i = 8064; .@i <= 8067; ++.@i) {
+				if (questprogress(.@i) && questprogress(.@i) != 2)
 					completequest .@i;
 			}
 			setquest 8068;
@@ -7499,7 +7499,8 @@ hugel,72,101,0	script	Burupu's Instructions	HIDDEN_NPC,{
 		break;
 	}
 	close2;
-	if (checkquest(12042) > -1) erasequest 12042;
+	if (questprogress(12042))
+		erasequest 12042;
 	end;
 }
 
@@ -8710,8 +8711,8 @@ hu_in01,14,11,4	script	Laura	1_F_GYPSY,{
 		next;
 		select("Yeah, yeah, whatever.:Sure thing.:I s-s-s-suppose...!:Yes, Ma'am!");
 		set hg_odin,17;
-		for(set .@i,11002; .@i<=11005; set .@i,.@i+1) {
-			if (checkquest(.@i) > -1 && checkquest(.@i) < 2)
+		for(.@i = 11002; .@i <= 11005; ++.@i) {
+			if (questprogress(.@i) && questprogress(.@i) != 2)
 				completequest .@i;
 		}
 		setquest 11006;
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 6f9a4c0d2..6ed364ed5 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -8491,8 +8491,8 @@ L_Mission:
 		mes "[Karl]";
 		mes ".........";
 		mes "............";
-		for(set .@i,12015; .@i<=12028; set .@i,.@i+1) {
-			if (checkquest(.@i) > 0 && checkquest(.@i) < 2)
+		for (.@i = 12015; .@i <= 12028; ++.@i) {
+			if (questprogress(.@i) && questprogress(.@i) != 2)
 				completequest .@i;
 		}
 		close;
diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index d928aefd6..e15780c5e 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -2126,8 +2126,8 @@ lou_in02,156,38,0	script	Studying Officer#lou	4_M_CHNMAN,{
 			mes "Here it is. A few days ago, someone asked me for the same document,";
 			mes "so I was able to find it again pretty easily. I hope it's useful to you.";
 			set ch_par,15;
-			for(set .@i,11051; .@i<=11054; set .@i,.@i+1) {
-				if (checkquest(.@i) > -1 && checkquest(.@i < 2))
+			for (.@i = 11051; .@i <= 11054; ++.@i) {
+				if (questprogress(.@i) && questprogress(.@i) != 2)
 					completequest .@i;
 			}
 			setquest 11055;
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 45ed535f8..b4e788568 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -4453,7 +4453,7 @@ prontera,153,353,4	script	Messenger#prince1	8W_SOLDIER,{
 }
 
 prt_castle,117,163,5	script	Inspector#prince	4_M_SAGE_C,{
-	if (checkquest(10004) == 0 || checkquest(10004) == 1) {
+	if (questprogress(10004) == 1) {
 		mes "[Inspector]";
 		mes "Judge!";
 		mes "How goes it? I don't think it is easy to meet seven candidates and appraise them.";
@@ -5243,7 +5243,7 @@ prt_castle,117,163,5	script	Inspector#prince	4_M_SAGE_C,{
 		mes "How is it going?";
 		mes "Grading someone is not a piece of cake. It's real hard work indeed. You do the hard work for our country.";
 		next;
-		if ((nkprince_eisen == 15) && (checkquest(10025) == 0 || checkquest(10025) == 1)) {
+		if (nkprince_eisen == 15 && questprogress(10025) == 1) {
 			mes "-I tell him about the Ahrum and Ernst accident.-";
 			next;
 			mes "[Inspector]";
@@ -5308,14 +5308,8 @@ prt_castle,117,163,5	script	Inspector#prince	4_M_SAGE_C,{
 		next;
 		switch(select("Yes.:No.")) {
 		case 1:
-			set .@prin1,checkquest(10005);
-			set .@prin2,checkquest(10006);
-			set .@prin3,checkquest(10007);
-			set .@prin4,checkquest(10008);
-			set .@prin5,checkquest(10009);
-			set .@prin6,checkquest(10010);
-			set .@prin7,checkquest(10011);
-			if (.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7 == 14) {
+			if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2
+			 && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) {
 				mes "[Inspector]";
 				mes "Very well.";
 				mes "I like hearing about the princes.";
@@ -5328,14 +5322,8 @@ prt_castle,117,163,5	script	Inspector#prince	4_M_SAGE_C,{
 			}
 			close;
 		case 2:
-			set .@prin1,checkquest(10005);
-			set .@prin2,checkquest(10006);
-			set .@prin3,checkquest(10007);
-			set .@prin4,checkquest(10008);
-			set .@prin5,checkquest(10009);
-			set .@prin6,checkquest(10010);
-			set .@prin7,checkquest(10011);
-			if (.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7 == 14) {
+			if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2
+			 && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) {
 				mes "[Inspector]";
 				mes "Don't be coy. I'm sure you have done it already.";
 				completequest 10004;
@@ -5355,13 +5343,13 @@ prt_castle,272,375,4	script	Prince	4_M_SITDOWN,{
 		mes "lock and key.-";
 		close;
 	}
-	if (checkquest(10020) == 2) {
+	if (questprogress(10020) == 2) {
 		mes "[Erich]";
 		mes "...What bad luck I have!";
 		mes "But he insists me to be corrupted, knowing how it would be...";
 		close;
 	}
-	else if (checkquest(10020) == 0 || checkquest(10020) == 1) {
+	else if (questprogress(10020) == 1) {
 		mes "[Erich]";
 		mes "These days, I have bad luck... Only harrassments happen to me...";
 		close;
@@ -5394,14 +5382,8 @@ prt_castle,272,375,4	script	Prince	4_M_SITDOWN,{
 		mes "You can ask information about me to my servant. I will take a rest.";
 		set nk_prince,6;
 		completequest 10011;
-		set .@prin1,checkquest(10005);
-		set .@prin2,checkquest(10006);
-		set .@prin3,checkquest(10007);
-		set .@prin4,checkquest(10008);
-		set .@prin5,checkquest(10009);
-		set .@prin6,checkquest(10010);
-		set .@prin7,checkquest(10011);
-		if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) {
+		if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2
+		 && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) {
 			setquest 10012;
 		}
 		close;
@@ -5417,7 +5399,7 @@ prt_castle,272,375,4	script	Prince	4_M_SITDOWN,{
 }
 
 prt_castle,274,372,4	script	Servant#hans	1_M_02,{
-	if (checkquest(10020) == 2) {
+	if (questprogress(10020) == 2) {
 		mes "[Hans]";
 		mes "Ahh... mmm... I...";
 		mes "I... am so, sorry!";
@@ -5427,7 +5409,7 @@ prt_castle,274,372,4	script	Servant#hans	1_M_02,{
 		mes "My prince didn't do anything wrong but, anyways, I apologize for anything to you!";
 		close;
 	}
-	else if (checkquest(10020) == 0 || checkquest(10020) == 1) {
+	else if (questprogress(10020) == 1) {
 		mes "Incessantly...-";
 		mes "-He has jitters whenever I react to him. His actions give me a feeling of pity.-";
 		close;
@@ -5507,7 +5489,7 @@ prt_castle,339,202,3	script	Prince#urgen	4_M_4THPRIN1,{
 		mes "It discomforts me...";
 		close;
 	}
-	if (checkquest(10021) == 2) {
+	if (questprogress(10021) == 2) {
 		mes "[Urugen]";
 		mes " feel very much displeased. Hey, what are you looking at? Get out!";
 		next;
@@ -5515,7 +5497,7 @@ prt_castle,339,202,3	script	Prince#urgen	4_M_4THPRIN1,{
 		mes "My beautiful body isn't in perfect condition right now. I don't want to show it to anyone today.";
 		close;
 	}
-	else if (checkquest(10021) == 0 || checkquest(10021) == 1) {
+	else if (questprogress(10021) == 1) {
 		mes "[Urugen]";
 		mes "...What? What did you...";
 		mes "just say to me?... Huh?";
@@ -5587,14 +5569,8 @@ prt_castle,339,202,3	script	Prince#urgen	4_M_4THPRIN1,{
 					completequest 10009;
 				}
 				completequest 10011;
-				set .@prin1,checkquest(10005);
-				set .@prin2,checkquest(10006);
-				set .@prin3,checkquest(10007);
-				set .@prin4,checkquest(10008);
-				set .@prin5,checkquest(10009);
-				set .@prin6,checkquest(10010);
-				set .@prin7,checkquest(10011);
-				if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) {
+				if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2
+				 && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) {
 					setquest 10012;
 				}
 				close;
@@ -5609,14 +5585,14 @@ prt_castle,289,201,3	script	Prince#helmut	4_M_5THPRIN1,{
 		mes "Such an idiot. I should have killed him earlier. Now I feel relieved.";
 		close;
 	}
-	if (checkquest(10022) == 2) {
+	if (questprogress(10022) == 2) {
 		mes "[Helmut]";
 		mes "Damn... Damn it!";
 		mes "Novice of Walter!!";
 		mes "How can I deal with this stress? Damn! Hell!";
 		close;
 	}
-	else if (checkquest(10022) == 0 || checkquest(10022) == 1) {
+	else if (questprogress(10022) == 1) {
 		mes "-He is so blushed,";
 		mes "evidently shown on his face.-";
 		close;
@@ -5668,14 +5644,8 @@ prt_castle,289,201,3	script	Prince#helmut	4_M_5THPRIN1,{
 			mes "[" + strcharinfo(0) + "]";
 			mes "......";
 			completequest 10010;
-			set .@prin1,checkquest(10005);
-			set .@prin2,checkquest(10006);
-			set .@prin3,checkquest(10007);
-			set .@prin4,checkquest(10008);
-			set .@prin5,checkquest(10009);
-			set .@prin6,checkquest(10010);
-			set .@prin7,checkquest(10011);
-			if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) {
+			if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2
+			 && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) {
 				setquest 10012;
 			}
 			close;
@@ -5713,14 +5683,8 @@ prt_castle,289,201,3	script	Prince#helmut	4_M_5THPRIN1,{
 			mes "[" + strcharinfo(0) + "]";
 			mes "......";
 			completequest 10010;
-			set .@prin1,checkquest(10005);
-			set .@prin2,checkquest(10006);
-			set .@prin3,checkquest(10007);
-			set .@prin4,checkquest(10008);
-			set .@prin5,checkquest(10009);
-			set .@prin6,checkquest(10010);
-			set .@prin7,checkquest(10011);
-			if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) {
+			if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2
+			 && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) {
 				setquest 10012;
 			}
 			close;
@@ -5758,14 +5722,8 @@ prt_castle,289,201,3	script	Prince#helmut	4_M_5THPRIN1,{
 			mes "[" + strcharinfo(0) + "]";
 			mes "......";
 			completequest 10010;
-			set .@prin1,checkquest(10005);
-			set .@prin2,checkquest(10006);
-			set .@prin3,checkquest(10007);
-			set .@prin4,checkquest(10008);
-			set .@prin5,checkquest(10009);
-			set .@prin6,checkquest(10010);
-			set .@prin7,checkquest(10011);
-			if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) {
+			if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2
+			 && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) {
 				setquest 10012;
 			}
 			close;
@@ -5806,12 +5764,12 @@ prt_castle,391,205,3	script	Prince#poe	4_M_6THPRIN1,{
 		mes "Whatever the condition is, he is just a loser in the match of life.";
 		close;
 	}
-	if (checkquest(10018) == 2) {
+	if (questprogress(10018) == 2) {
 		mes "[Poe]";
 		mes "He gave up without any challenge. That's not what the man has to do. He is not as good as me. But okay. I am disappointed in him. Eigen Ahrum.";
 		close;
 	}
-	else if (checkquest(10018) == 0 || checkquest(10018) == 1) {
+	else if (questprogress(10018) == 1) {
 		mes "[Poe]";
 		mes "......";
 		close;
@@ -6008,14 +5966,8 @@ prt_castle,391,205,3	script	Prince#poe	4_M_6THPRIN1,{
 				if (.@p_a + .@p_b + .@p_c == 3) {
 					completequest 10007;
 				}
-				set .@prin1,checkquest(10005);
-				set .@prin2,checkquest(10006);
-				set .@prin3,checkquest(10007);
-				set .@prin4,checkquest(10008);
-				set .@prin5,checkquest(10009);
-				set .@prin6,checkquest(10010);
-				set .@prin7,checkquest(10011);
-				if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) {
+				if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2
+				 && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) {
 					setquest 10012;
 				}
 				close;
@@ -6032,7 +5984,7 @@ prt_castle,364,375,4	script	Prince#peter	4_M_3RDPRIN1,{
 		next;
 		switch(select("Yes, I saw her for you.:No, I don't want to.")) {
 		case 1:
-			if (checkquest(10014) == 0 || checkquest(10014) == 1) {
+			if (questprogress(10014) == 1) {
 				mes "[Peter]";
 				mes "I am glad that the girl liked it. Once I got cured, I wanted to go meet with her.";
 				next;
@@ -6046,7 +5998,7 @@ prt_castle,364,375,4	script	Prince#peter	4_M_3RDPRIN1,{
 			mes "Thinking about the little girl calms me. I still can't believe my eyes. My prince Ahrum who just passed away...~";
 			close;
 		case 2:
-			if (checkquest(10014) == 0 || checkquest(10014) == 1) {
+			if (questprogress(10014) == 1) {
 				mes "[Peter]";
 				mes "As you said.";
 				mes "I've heard that her life is like a flower when I lost it.";
@@ -6064,25 +6016,25 @@ prt_castle,364,375,4	script	Prince#peter	4_M_3RDPRIN1,{
 			close;
 		}
 	}
-	if (checkquest(10019) == 2) {
+	if (questprogress(10019) == 2) {
 		mes "[Peter]";
 		mes "Child... What the heck happened to you?...";
 		close;
 	}
-	else if (checkquest(10019) == 0 || checkquest(10019) == 1) {
+	else if (questprogress(10019) == 1) {
 		mes "[Peter]";
 		mes "......";
 		close;
 	}
-	if (checkquest(10008) == 2) {
-		set .@quest, checkquest(10014);
+	if (questprogress(10008) == 2) {
+		.@quest = questprogress(10014);
 		if (.@quest == 2) {
 			mes "[Peter]";
 			mes "I really appreciate it.";
 			mes "You are so kind.";
 			close;
 		}
-		else if (.@quest == 0 || .@quest == 1) {
+		else if (.@quest == 1) {
 			mes "[Peter]";
 			mes "I am glad that the girl liked it. Once I got cured, I wanted to go meet with her.";
 			next;
@@ -6172,14 +6124,8 @@ prt_castle,364,375,4	script	Prince#peter	4_M_3RDPRIN1,{
 						mes "Please take care.";
 						getitem 744,1; //Bunch_Of_Flowers
 						setquest 10013;
-						set .@prin1,checkquest(10005);
-						set .@prin2,checkquest(10006);
-						set .@prin3,checkquest(10007);
-						set .@prin4,checkquest(10008);
-						set .@prin5,checkquest(10009);
-						set .@prin6,checkquest(10010);
-						set .@prin7,checkquest(10011);
-						if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) {
+						if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2
+						 && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) {
 							setquest 10012;
 						}
 						close;
@@ -6189,14 +6135,8 @@ prt_castle,364,375,4	script	Prince#peter	4_M_3RDPRIN1,{
 						mes "I know you have your";
 						mes "own business.";
 						setquest 10013;
-						set .@prin1,checkquest(10005);
-						set .@prin2,checkquest(10006);
-						set .@prin3,checkquest(10007);
-						set .@prin4,checkquest(10008);
-						set .@prin5,checkquest(10009);
-						set .@prin6,checkquest(10010);
-						set .@prin7,checkquest(10011);
-						if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) {
+						if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2
+						 && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) {
 							setquest 10012;
 						}
 						close;
@@ -6208,7 +6148,7 @@ prt_castle,364,375,4	script	Prince#peter	4_M_3RDPRIN1,{
 }
 
 aldebaran,132,184,3	script	Girl#prince	4W_KID,{
-	if (checkquest(10013) == 0 || checkquest(10013) == 1) {
+	if (questprogress(10013) == 1) {
 		if (countitem(744) > 0) {
 			mes "[Girl]";
 			mes "Wooah, Uncle Peter sent these flowers";
@@ -6681,14 +6621,8 @@ prt_castle,314,373,4	script	Prince#eisen	4_M_1STPRIN1,{
 					set nkprince_eisen,1;
 				}
 				completequest 10005;
-				set .@prin1,checkquest(10005);
-				set .@prin2,checkquest(10006);
-				set .@prin3,checkquest(10007);
-				set .@prin4,checkquest(10008);
-				set .@prin5,checkquest(10009);
-				set .@prin6,checkquest(10010);
-				set .@prin7,checkquest(10011);
-				if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) {
+				if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2
+				 && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) {
 					setquest 10012;
 				}
 				close;
@@ -6698,14 +6632,14 @@ prt_castle,314,373,4	script	Prince#eisen	4_M_1STPRIN1,{
 }
 
 prt_castle,368,312,4	script	Prince#ern	4_M_2NDPRIN1,{
-	if (checkquest(10024) == 2) {
+	if (questprogress(10024) == 2) {
 		mes "[Ernst]";
 		mes "...brother, if you want...";
 		mes "...Ah, please leave here.";
 		mes "I don't want to see anyone.";
 		close;
 	}
-	else if (checkquest(10024) == 0 || checkquest(10024) == 1) {
+	else if (questprogress(10024) == 1) {
 		mes "[Ernst]";
 		mes "...Brother Ahrum...";
 		close;
@@ -6874,14 +6808,8 @@ prt_castle,368,312,4	script	Prince#ern	4_M_2NDPRIN1,{
 					set nkprince_eisen,2;
 				}
 				completequest 10006;
-				set .@prin1,checkquest(10005);
-				set .@prin2,checkquest(10006);
-				set .@prin3,checkquest(10007);
-				set .@prin4,checkquest(10008);
-				set .@prin5,checkquest(10009);
-				set .@prin6,checkquest(10010);
-				set .@prin7,checkquest(10011);
-				if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) {
+				if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2
+				 && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) {
 					setquest 10012;
 				}
 				close;
@@ -7290,12 +7218,8 @@ prt_castle,272,372,1	script	Prince#eisen1	4_M_1STPRIN1,{
 	mes "[Erich]";
 	mes "...Nuts.";
 	completequest 10020;
-	set .@er1,checkquest(10018);
-	set .@er2,checkquest(10019);
-	set .@er3,checkquest(10020);
-	set .@er4,checkquest(10021);
-	set .@er5,checkquest(10022);
-	if ((.@er1 + .@er2 + .@er3 + .@er4 + .@er5) == 10) {
+	if (questprogress(10018) == 2 && questprogress(10019) == 2 && questprogress(10020) == 2
+	 && questprogress(10021) == 2 && questprogress(10022) == 2) {
 		setquest 10023;
 		set nkprince_eisen,11;
 	}
@@ -7348,12 +7272,8 @@ prt_castle,336,202,7	script	Prince#eisen2	4_M_1STPRIN1,{
 	mes "[Urugen]";
 	mes "...You are so low. I misjudged you. You are not of the few that have an artistic view. I totally saw you the wrong way.";
 	completequest 10021;
-	set .@er1,checkquest(10018);
-	set .@er2,checkquest(10019);
-	set .@er3,checkquest(10020);
-	set .@er4,checkquest(10021);
-	set .@er5,checkquest(10022);
-	if ((.@er1 + .@er2 + .@er3 + .@er4 + .@er5) == 10) {
+	if (questprogress(10018) == 2 && questprogress(10019) == 2 && questprogress(10020) == 2
+	 && questprogress(10021) == 2 && questprogress(10022) == 2) {
 		setquest 10023;
 		set nkprince_eisen,11;
 	}
@@ -7403,12 +7323,8 @@ prt_castle,286,201,7	script	Prince#eisen3	4_M_1STPRIN1,{
 	mes "[Helmut]";
 	mes "That is... such a villain!!!";
 	completequest 10022;
-	set .@er1,checkquest(10018);
-	set .@er2,checkquest(10019);
-	set .@er3,checkquest(10020);
-	set .@er4,checkquest(10021);
-	set .@er5,checkquest(10022);
-	if ((.@er1 + .@er2 + .@er3 + .@er4 + .@er5) == 10) {
+	if (questprogress(10018) == 2 && questprogress(10019) == 2 && questprogress(10020) == 2
+	 && questprogress(10021) == 2 && questprogress(10022) == 2) {
 		setquest 10023;
 		set nkprince_eisen,11;
 	}
@@ -7467,12 +7383,8 @@ prt_castle,388,205,6	script	Prince#eisen4	4_M_1STPRIN1,{
 	mes "What... What. It's not fun.";
 	mes "I totally couldn't get him.";
 	completequest 10018;
-	set .@er1,checkquest(10018);
-	set .@er2,checkquest(10019);
-	set .@er3,checkquest(10020);
-	set .@er4,checkquest(10021);
-	set .@er5,checkquest(10022);
-	if ((.@er1 + .@er2 + .@er3 + .@er4 + .@er5) == 10) {
+	if (questprogress(10018) == 2 && questprogress(10019) == 2 && questprogress(10020) == 2
+	 && questprogress(10021) == 2 && questprogress(10022) == 2) {
 		setquest 10023;
 		set nkprince_eisen,11;
 	}
@@ -7531,12 +7443,8 @@ prt_castle,364,372,1	script	Prince#eisen5	4_M_1STPRIN1,{
 	mes "[Peter]";
 	mes "......";
 	completequest 10019;
-	set .@er1,checkquest(10018);
-	set .@er2,checkquest(10019);
-	set .@er3,checkquest(10020);
-	set .@er4,checkquest(10021);
-	set .@er5,checkquest(10022);
-	if ((.@er1 + .@er2 + .@er3 + .@er4 + .@er5) == 10) {
+	if (questprogress(10018) == 2 && questprogress(10019) == 2 && questprogress(10020) == 2
+	 && questprogress(10021) == 2 && questprogress(10022) == 2) {
 		setquest 10023;
 		set nkprince_eisen,11;
 	}
@@ -7737,7 +7645,7 @@ OnTouch:
 
 prt_castle,336,276,0	script	#ern	WARPNPC,1,1,{
 OnTouch:
-	if (checkquest(10023) == 0 || checkquest(10023) == 1) {
+	if (questprogress(10023) == 1) {
 		donpcevent "Prince#eisen6::OnEnable";
 	}
 	warp "prt_castle",368,308;
@@ -7746,7 +7654,7 @@ OnTouch:
 
 prt_castle,300,276,0	script	#erich	WARPNPC,1,1,{
 OnTouch:
-	if (checkquest(10020) == 0 || checkquest(10020) == 1) {
+	if (questprogress(10020) == 1) {
 		donpcevent "Prince#eisen1::OnEnable";
 	}
 	warp "prt_castle",274,368;
@@ -7755,7 +7663,7 @@ OnTouch:
 
 prt_castle,330,271,0	script	#helmut	WARPNPC,1,1,{
 OnTouch:
-	if (checkquest(10022) == 0 || checkquest(10022) == 1) {
+	if (questprogress(10022) == 1) {
 		donpcevent "Prince#eisen3::OnEnable";
 	}
 	warp "prt_castle",290,208;
@@ -7764,7 +7672,7 @@ OnTouch:
 
 prt_castle,348,271,0	script	#poe	WARPNPC,1,1,{
 OnTouch:
-	if (checkquest(10018) == 0 || checkquest(10018) == 1) {
+	if (questprogress(10018) == 1) {
 		donpcevent "Prince#eisen4::OnEnable";
 	}
 	warp "prt_castle",390,208;
@@ -7773,7 +7681,7 @@ OnTouch:
 
 prt_castle,354,276,0	script	#peter	WARPNPC,1,1,{
 OnTouch:
-	if (checkquest(10019) == 0 || checkquest(10019) == 1) {
+	if (questprogress(10019) == 1) {
 		donpcevent "Prince#eisen5::OnEnable";
 	}
 	warp "prt_castle",366,368;
@@ -7782,7 +7690,7 @@ OnTouch:
 
 prt_castle,310,271,0	script	#urgen	WARPNPC,1,1,{
 OnTouch:
-	if (checkquest(10021) == 0 || checkquest(10021) == 1) {
+	if (questprogress(10021) == 1) {
 		donpcevent "Prince#eisen2::OnEnable";
 	}
 	warp "prt_castle",340,208;