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

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

42 files changed, 657 insertions, 835 deletions

diff --git a/npc/battleground/flavius/flavius01.txt b/npc/battleground/flavius/flavius01.txt
index 18f153d87..a02752d52 100644
--- a/npc/battleground/flavius/flavius01.txt
+++ b/npc/battleground/flavius/flavius01.txt
@@ -377,14 +377,14 @@ OnTouch:
 
 bat_b01,87,76,0	script	A_CODE#bat_b01	-1,5,5,{
 OnTouch:
-	if (checkquest(2070) < 0)
+	if (!questprogress(2070))
 		setquest 2070;
 	end;
 }
 
 bat_b01,312,224,0	script	B_CODE#bat_b01	-1,5,5,{
 OnTouch:
-	if (checkquest(2070) < 0)
+	if (!questprogress(2070))
 		setquest 2070;
 	end;
 }
diff --git a/npc/battleground/flavius/flavius02.txt b/npc/battleground/flavius/flavius02.txt
index 0a88b9919..79b7b5168 100644
--- a/npc/battleground/flavius/flavius02.txt
+++ b/npc/battleground/flavius/flavius02.txt
@@ -378,15 +378,15 @@ OnTouch:
 
 bat_b02,87,76,0	script	A_CODE#bat_b02	-1,5,5,{
 OnTouch:
-	if (checkquest(2070) < 0)
-		//setquest 2070;
+	//if (!questprogress(2070))
+	//	setquest 2070;
 	end;
 }
 
 bat_b02,312,224,0	script	B_CODE#bat_b02	-1,5,5,{
 OnTouch:
-	if (checkquest(2070) < 0)
-		//setquest 2070;
+	//if (!questprogress(2070))
+	//	setquest 2070;
 	end;
 }
 
diff --git a/npc/battleground/flavius/flavius_enter.txt b/npc/battleground/flavius/flavius_enter.txt
index d63130007..315eff2cb 100644
--- a/npc/battleground/flavius/flavius_enter.txt
+++ b/npc/battleground/flavius/flavius_enter.txt
@@ -30,48 +30,41 @@ bat_room,133,178,5	script	Flavius Officer#01a	4_M_KY_KNT,{
 		if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
 			mes "[Guillaume Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
+			break;
 		}
-		else {
-			if (BaseLevel < 80) {
-				mes "[Guillaume Army Officer]";
-				mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
-			}
-			else {
-				set .@chk_urtime,checkquest(2070,PLAYTIME);
-				if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) {
-					mes "[Guillaume Army Officer]";
-					mes "You seem to have just returned from the battlefield.";
-					mes "It's too early for you to go back. Go rest, and leave the enemies to us!";
-				}
-				else {
-					if (.@chk_urtime == 2)
-						erasequest 2070;
-					set .@mapcount2,getmapusers("bat_b01");
-					if (.@mapcount2 > 0) {
-						mes "[Guillaume Army Officer]";
-						mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already.";
-						mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
-					}
-					else {
-						if ($@FlaviusBG1 > 0) {
-							mes "[Guillaume Army Officer]";
-							mes "An elite corps is already standing by to be dispatched to the battlefield.";
-							mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
-						}
-						else {
-							mes "[Guillaume Army Officer]";
-							mes "You definitely seem to be ready for battle!";
-							mes "Go show the Croixs what fear truly means!";
-							mes "Today, our cry of victory shall echo all over the battlefield!";
-							close2;
-							warp "bat_room",85,223;
-							end;
-						}
-					}
-				}
-			}
+		if (BaseLevel < 80) {
+			mes "[Guillaume Army Officer]";
+			mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
+			break;
 		}
-		break;
+		.@chk_urtime = questprogress(2070, PLAYTIME);
+		if (.@chk_urtime == 1) {
+			mes "[Guillaume Army Officer]";
+			mes "You seem to have just returned from the battlefield.";
+			mes "It's too early for you to go back. Go rest, and leave the enemies to us!";
+			break;
+		}
+		if (.@chk_urtime == 2)
+			erasequest 2070;
+		if (getmapusers("bat_b01") > 0) {
+			mes "[Guillaume Army Officer]";
+			mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already.";
+			mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
+			break;
+		}
+		if ($@FlaviusBG1 > 0) {
+			mes "[Guillaume Army Officer]";
+			mes "An elite corps is already standing by to be dispatched to the battlefield.";
+			mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
+			break;
+		}
+		mes "[Guillaume Army Officer]";
+		mes "You definitely seem to be ready for battle!";
+		mes "Go show the Croixs what fear truly means!";
+		mes "Today, our cry of victory shall echo all over the battlefield!";
+		close2;
+		warp "bat_room",85,223;
+		end;
 	case 2:
 		mes "[Guillaume Army Officer]";
 		mes "Today, we shall be victorious!";
@@ -97,48 +90,41 @@ bat_room,133,121,1	script	Flavius Officer#01b	4_M_CRU_KNT,{
 		if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
 			mes "[Croix Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
+			break;
 		}
-		else {
-			if (BaseLevel < 80) {
-				mes "[Croix Army Officer]";
-				mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
-			}
-			else {
-				set .@chk_urtime,checkquest(2070,PLAYTIME);
-				if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) {
-					mes "[Croix Army Officer]";
-					mes "You seem to have just returned from the battlefield.";
-					mes "It's too early for you to go back. Go rest, and leave the enemies to us!";
-				}
-				else {
-					if (.@chk_urtime == 2)
-						erasequest 2070;
-					set .@mapcount2,getmapusers("bat_b01");
-					if (.@mapcount2 > 0) {
-						mes "[Croix Army Officer]";
-						mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already.";
-						mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
-					}
-					else {
-						if ($@FlaviusBG1 > 0) {
-							mes "[Croix Army Officer]";
-							mes "An elite corps is already standing by to be dispatched to the battlefield.";
-							mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
-						}
-						else {
-							mes "[Croix Army Officer]";
-							mes "You definitely seem to be ready for battle!";
-							mes "Go show the Guillaumes what fear truly means!";
-							mes "Today, our cry of victory shall echo all over the battlefield!";
-							close2;
-							warp "bat_room",85,207;
-							end;
-						}
-					}
-				}
-			}
+		if (BaseLevel < 80) {
+			mes "[Croix Army Officer]";
+			mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
+			break;
 		}
-		break;
+		.@chk_urtime = questprogress(2070,PLAYTIME);
+		if (.@chk_urtime == 1) {
+			mes "[Croix Army Officer]";
+			mes "You seem to have just returned from the battlefield.";
+			mes "It's too early for you to go back. Go rest, and leave the enemies to us!";
+			break;
+		}
+		if (.@chk_urtime == 2)
+			erasequest 2070;
+		if (getmapusers("bat_b01") > 0) {
+			mes "[Croix Army Officer]";
+			mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already.";
+			mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
+			break;
+		}
+		if ($@FlaviusBG1 > 0) {
+			mes "[Croix Army Officer]";
+			mes "An elite corps is already standing by to be dispatched to the battlefield.";
+			mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
+			break;
+		}
+		mes "[Croix Army Officer]";
+		mes "You definitely seem to be ready for battle!";
+		mes "Go show the Guillaumes what fear truly means!";
+		mes "Today, our cry of victory shall echo all over the battlefield!";
+		close2;
+		warp "bat_room",85,207;
+		end;
 	case 2:
 		mes "[Croix Army Officer]";
 		mes "Today, we shall be victorious!";
@@ -254,48 +240,41 @@ bat_room,148,178,5	script	Flavius Officer#02a	4_M_KY_KNT,{
 		if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
 			mes "[Guillaume Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
+			break;
 		}
-		else {
-			if (BaseLevel < 80) {
-				mes "[Guillaume Army Officer]";
-				mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
-			}
-			else {
-				set .@chk_urtime,checkquest(2070,PLAYTIME);
-				if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) {
-					mes "[Guillaume Army Officer]";
-					mes "You seem to have just returned from the battlefield.";
-					mes "It's too early for you to go back. Go rest, and leave the enemies to us!";
-				}
-				else {
-					if (.@chk_urtime == 2)
-						erasequest 2070;
-					set .@mapcount2,getmapusers("bat_b02");
-					if (.@mapcount2 > 0) {
-						mes "[Guillaume Army Officer]";
-						mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already.";
-						mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
-					}
-					else {
-						if ($@FlaviusBG2 > 0) {
-							mes "[Guillaume Army Officer]";
-							mes "An elite corps is already standing by to be dispatched to the battlefield.";
-							mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
-						}
-						else {
-							mes "[Guillaume Army Officer]";
-							mes "You definitely seem to be ready for battle!";
-							mes "Go show the Croixs what fear truly means!";
-							mes "Today, our cry of victory shall echo all over the battlefield!";
-							close2;
-							warp "bat_room",141,224;
-							end;
-						}
-					}
-				}
-			}
+		if (BaseLevel < 80) {
+			mes "[Guillaume Army Officer]";
+			mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
+			break;
 		}
-		break;
+		.@chk_urtime = questprogress(2070, PLAYTIME);
+		if (.@chk_urtime == 1) {
+			mes "[Guillaume Army Officer]";
+			mes "You seem to have just returned from the battlefield.";
+			mes "It's too early for you to go back. Go rest, and leave the enemies to us!";
+			break;
+		}
+		if (.@chk_urtime == 2)
+			erasequest 2070;
+		if (getmapusers("bat_b02") > 0) {
+			mes "[Guillaume Army Officer]";
+			mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already.";
+			mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
+			break;
+		}
+		if ($@FlaviusBG2 > 0) {
+			mes "[Guillaume Army Officer]";
+			mes "An elite corps is already standing by to be dispatched to the battlefield.";
+			mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
+			break;
+		}
+		mes "[Guillaume Army Officer]";
+		mes "You definitely seem to be ready for battle!";
+		mes "Go show the Croixs what fear truly means!";
+		mes "Today, our cry of victory shall echo all over the battlefield!";
+		close2;
+		warp "bat_room",141,224;
+		end;
 	case 2:
 		mes "[Guillaume Army Officer]";
 		mes "Today, we shall be victorious!";
@@ -321,48 +300,41 @@ bat_room,148,121,1	script	Flavius Officer#02b	4_M_CRU_KNT,{
 		if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
 			mes "[Croix Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
+			break;
 		}
-		else {
-			if (BaseLevel < 80) {
-				mes "[Croix Army Officer]";
-				mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
-			}
-			else {
-				set .@chk_urtime,checkquest(2070,PLAYTIME);
-				if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) {
-					mes "[Croix Army Officer]";
-					mes "You seem to have just returned from the battlefield.";
-					mes "It's too early for you to go back. Go rest, and leave the enemies to us!";
-				}
-				else {
-					if (.@chk_urtime == 2)
-						erasequest 2070;
-					set .@mapcount2,getmapusers("bat_b02");
-					if (.@mapcount2 > 0) {
-						mes "[Croix Army Officer]";
-						mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already.";
-						mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
-					}
-					else {
-						if ($@FlaviusBG2 > 0) {
-							mes "[Croix Army Officer]";
-							mes "An elite corps is already standing by to be dispatched to the battlefield.";
-							mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
-						}
-						else {
-							mes "[Croix Army Officer]";
-							mes "You definitely seem to be ready for battle!";
-							mes "Go show the Guillaumes what fear truly means!";
-							mes "Today, our cry of victory shall echo all over the battlefield!";
-							close2;
-							warp "bat_room",141,207;
-							end;
-						}
-					}
-				}
-			}
+		if (BaseLevel < 80) {
+			mes "[Croix Army Officer]";
+			mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
+			break;
 		}
-		break;
+		.@chk_urtime = questprogress(2070,PLAYTIME);
+		if (.@chk_urtime == 1) {
+			mes "[Croix Army Officer]";
+			mes "You seem to have just returned from the battlefield.";
+			mes "It's too early for you to go back. Go rest, and leave the enemies to us!";
+			break;
+		}
+		if (.@chk_urtime == 2)
+			erasequest 2070;
+		if (getmapusers("bat_b02") > 0) {
+			mes "[Croix Army Officer]";
+			mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already.";
+			mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
+			break;
+		}
+		if ($@FlaviusBG2 > 0) {
+			mes "[Croix Army Officer]";
+			mes "An elite corps is already standing by to be dispatched to the battlefield.";
+			mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
+			break;
+		}
+		mes "[Croix Army Officer]";
+		mes "You definitely seem to be ready for battle!";
+		mes "Go show the Guillaumes what fear truly means!";
+		mes "Today, our cry of victory shall echo all over the battlefield!";
+		close2;
+		warp "bat_room",141,207;
+		end;
 	case 2:
 		mes "[Croix Army Officer]";
 		mes "Today, we shall be victorious!";
diff --git a/npc/battleground/kvm/kvm_enter.txt b/npc/battleground/kvm/kvm_enter.txt
index 1b5e9062c..8f9f40e2b 100644
--- a/npc/battleground/kvm/kvm_enter.txt
+++ b/npc/battleground/kvm/kvm_enter.txt
@@ -19,16 +19,16 @@
 //============================================================
 bat_room,164,178,5	script	KVM Mercenary Officer#1	4_M_KY_KNT,{
 	/*
-	set .@kvm,checkquest(6026,PLAYTIME);
-	if ((.@kvm == 0) || (.@kvm == 1)) {
+	.@kvm = questprogress(6026,PLAYTIME);
+	if (.@kvm == 1) {
 		mes "[Croix Mercenary Officer]";
 		mes "I know that you've already signed with the Croix. Go back and join their team. We will not accept traitors to fight for us.";
 		close;
 	}
 	else if (.@kvm == 2) erasequest 6026;
 	*/
-	set .@permit,checkquest(6025,PLAYTIME);
-	if ((.@permit == 0) || (.@permit == 1)) {
+	.@permit = questprogress(6025,PLAYTIME);
+	if (.@permit == 1) {
 		mes "[Guillaume Mercenary Officer]";
 		mes "It seems you have recently participated in a KVM battle. You must wait 5 minutes before signing up again.";
 		close;
@@ -119,16 +119,16 @@ bat_room,167,178,5	script	Guillaume Knight#kvm	4_M_KY_SOLD,{
 //============================================================
 bat_room,164,121,1	script	KVM Mercenary Officer#2	4_M_CRU_KNT,{
 	/*
-	set .@kvm,checkquest(6025,PLAYTIME);
-	if ((.@kvm == 0) || (.@kvm == 1)) {
+	.@kvm = questprogress(6025,PLAYTIME);
+	if (.@kvm == 1) {
 		mes "[Croix Mercenary Officer]";
 		mes "I know that you've already signed with the Guillaume. Go back and join their team. We will not accept traitors to fight for us.";
 		close;
 	}
 	else if (.@kvm == 2) erasequest 6025;
 	*/
-	set .@permit,checkquest(6025,PLAYTIME);
-	if ((.@permit == 0) || (.@permit == 1)) {
+	.@permit = questprogress(6025,PLAYTIME);
+	if (.@permit == 1) {
 		mes "[Croix Mercenary Officer]";
 		mes "It seems you have recently participated in a KVM battle. You must wait 5 minutes before signing up again.";
 		close;
diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt
index 10e2bfc85..2a6d5991a 100644
--- a/npc/battleground/tierra/tierra01.txt
+++ b/npc/battleground/tierra/tierra01.txt
@@ -73,7 +73,7 @@ bat_a01,352,342,0	script	#bat_a01_quest_a	-1,5,5,{
 	end;
 
 OnTouch:
-	if (checkquest(2069) < 0)
+	if (!questprogress(2069))
 		setquest 2069;
 	end;
 }
@@ -82,7 +82,7 @@ bat_a01,353,52,0	script	#bat_a01_quest_b	-1,5,5,{
 	end;
 
 OnTouch:
-	if (checkquest(2069) < 0)
+	if (!questprogress(2069))
 		setquest 2069;
 	end;
 }
@@ -634,16 +634,14 @@ OnTouch:
 
 bat_a01,352,342,0	script	A_CODE#bat_a01	-1,5,5,{
 OnTouch:
-	set .@chk_bfquest,checkquest(2069);
-	if ((.@chk_bfquest == 0) || (.@chk_bfquest == 1))
+	if (questprogress(2069) == 1)
 		setquest 2069;
 	end;
 }
 
 bat_a01,353,52,0	script	B_CODE#bat_a01	-1,5,5,{
 OnTouch:
-	set .@chk_bfquest,checkquest(2069);
-	if ((.@chk_bfquest == 0) || (.@chk_bfquest == 1))
+	if (questprogress(2069) == 1)
 		setquest 2069;
 	end;
 }
diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt
index 0e7cc773d..129d0ee3e 100644
--- a/npc/battleground/tierra/tierra02.txt
+++ b/npc/battleground/tierra/tierra02.txt
@@ -72,7 +72,7 @@ bat_a02,352,342,0	script	#bat_a02_quest_a	-1,5,5,{
 	end;
 
 OnTouch:
-	if (checkquest(2069) < 0)
+	if (!questprogress(2069))
 		setquest 2069;
 	end;
 }
@@ -81,7 +81,7 @@ bat_a02,353,52,0	script	#bat_a02_quest_b	-1,5,5,{
 	end;
 
 OnTouch:
-	if (checkquest(2069) < 0)
+	if (!questprogress(2069))
 		setquest 2069;
 	end;
 }
@@ -633,16 +633,14 @@ OnTouch:
 
 bat_a02,352,342,0	script	A_CODE#bat_a02	-1,5,5,{
 OnTouch:
-	set .@chk_bfquest,checkquest(2069);
-	if ((.@chk_bfquest == 0) || (.@chk_bfquest == 1))
+	if (questprogress(2069) == 1)
 		setquest 2069;
 	end;
 }
 
 bat_a02,353,52,0	script	B_CODE#bat_a02	-1,5,5,{
 OnTouch:
-	set .@chk_bfquest,checkquest(2069);
-	if ((.@chk_bfquest == 0) || (.@chk_bfquest == 1))
+	if (questprogress(2069) == 1)
 		setquest 2069;
 	end;
 }
diff --git a/npc/battleground/tierra/tierra_enter.txt b/npc/battleground/tierra/tierra_enter.txt
index e68058247..19ceb732e 100644
--- a/npc/battleground/tierra/tierra_enter.txt
+++ b/npc/battleground/tierra/tierra_enter.txt
@@ -31,48 +31,41 @@ bat_room,124,178,5	script	Tierra Gorge Officer#01a	4_M_KY_KNT,{
 		if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
 			mes "[Guillaume Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
+			break;
 		}
-		else {
-			if (BaseLevel < 80) {
-				mes "[Guillaume Army Officer]";
-				mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
-			}
-			else {
-				set .@chk_urtime,checkquest(2069,PLAYTIME);
-				if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) {
-					mes "[Guillaume Army Officer]";
-					mes "You seem to have just returned from the battlefield.";
-					mes "It's too early for you to go back. Go rest, and leave the enemies to us!";
-				}
-				else {
-					if (.@chk_urtime == 2)
-						erasequest 2069;
-					set .@mapcount,getmapusers("bat_a01");
-					if (.@mapcount > 0) {
-						mes "[Guillaume Army Officer]";
-						mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already.";
-						mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
-					}
-					else {
-						if ($@TierraBG1) {
-							mes "[Guillaume Army Officer]";
-							mes "An elite corps is already standing by to be dispatched to the battlefield.";
-							mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
-						}
-						else {
-							mes "[Guillaume Army Officer]";
-							mes "You definitely seem to be ready for battle!";
-							mes "Go show the Croixs what fear truly means!";
-							mes "Today, our cry of victory shall echo all over the battlefield!";
-							close2;
-							warp "bat_room",57,223;
-							end;
-						}
-					}
-				}
-			}
+		if (BaseLevel < 80) {
+			mes "[Guillaume Army Officer]";
+			mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
+			break;
 		}
-		break;
+		.@chk_urtime = questprogress(2069,PLAYTIME);
+		if (.@chk_urtime == 1) {
+			mes "[Guillaume Army Officer]";
+			mes "You seem to have just returned from the battlefield.";
+			mes "It's too early for you to go back. Go rest, and leave the enemies to us!";
+			break;
+		}
+		if (.@chk_urtime == 2)
+			erasequest 2069;
+		if (getmapusers("bat_a01") > 0) {
+			mes "[Guillaume Army Officer]";
+			mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already.";
+			mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
+			break;
+		}
+		if ($@TierraBG1) {
+			mes "[Guillaume Army Officer]";
+			mes "An elite corps is already standing by to be dispatched to the battlefield.";
+			mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
+			break;
+		}
+		mes "[Guillaume Army Officer]";
+		mes "You definitely seem to be ready for battle!";
+		mes "Go show the Croixs what fear truly means!";
+		mes "Today, our cry of victory shall echo all over the battlefield!";
+		close2;
+		warp "bat_room",57,223;
+		end;
 	case 2:
 		mes "[Guillaume Army Officer]";
 		mes "Today, we shall be victorious!";
@@ -98,48 +91,41 @@ bat_room,140,178,5	script	Tierra Gorge Officer#02a	4_M_KY_KNT,{
 		if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
 			mes "[Guillaume Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
+			break;
 		}
-		else {
-			if (BaseLevel < 80) {
-				mes "[Guillaume Army Officer]";
-				mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
-			}
-			else {
-				set .@chk_urtime,checkquest(2069,PLAYTIME);
-				if (.@chk_urtime == 1) {
-					mes "[Guillaume Army Officer]";
-					mes "You seem to have just returned from the battlefield.";
-					mes "It's too early for you to go back. Go rest, and leave the enemies to us!";
-				}
-				else {
-					if (.@chk_urtime == 2)
-						erasequest 2069;
-					set .@mapcount,getmapusers("bat_a02");
-					if (.@mapcount > 0) {
-						mes "[Guillaume Army Officer]";
-						mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already.";
-						mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
-					}
-					else {
-						if ($@TierraBG2) {
-							mes "[Guillaume Army Officer]";
-							mes "An elite corps is already standing by to be dispatched to the battlefield.";
-							mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
-						}
-						else {
-							mes "[Guillaume Army Officer]";
-							mes "You definitely seem to be ready for battle!";
-							mes "Go show the Croixs what fear truly means!";
-							mes "Today, our cry of victory shall echo all over the battlefield!";
-							close2;
-							warp "bat_room",114,223;
-							end;
-						}
-					}
-				}
-			}
+		if (BaseLevel < 80) {
+			mes "[Guillaume Army Officer]";
+			mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
+			break;
 		}
-		break;
+		.@chk_urtime = questprogress(2069,PLAYTIME);
+		if (.@chk_urtime == 1) {
+			mes "[Guillaume Army Officer]";
+			mes "You seem to have just returned from the battlefield.";
+			mes "It's too early for you to go back. Go rest, and leave the enemies to us!";
+			break;
+		}
+		if (.@chk_urtime == 2)
+			erasequest 2069;
+		if (getmapusers("bat_a02") > 0) {
+			mes "[Guillaume Army Officer]";
+			mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already.";
+			mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
+			break;
+		}
+		if ($@TierraBG2) {
+			mes "[Guillaume Army Officer]";
+			mes "An elite corps is already standing by to be dispatched to the battlefield.";
+			mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
+			break;
+		}
+		mes "[Guillaume Army Officer]";
+		mes "You definitely seem to be ready for battle!";
+		mes "Go show the Croixs what fear truly means!";
+		mes "Today, our cry of victory shall echo all over the battlefield!";
+		close2;
+		warp "bat_room",114,223;
+		end;
 	case 2:
 		mes "[Guillaume Army Officer]";
 		mes "Today, we shall be victorious!";
@@ -263,48 +249,41 @@ bat_room,125,121,1	script	Tierra Gorge Officer#01b	4_M_CRU_KNT,{
 		if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
 			mes "[Croix Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
+			break;
 		}
-		else {
-			if (BaseLevel < 80) {
-				mes "[Croix Army Officer]";
-				mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
-			}
-			else {
-				set .@chk_urtime,checkquest(2069,PLAYTIME);
-				if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) {
-					mes "[Croix Army Officer]";
-					mes "You seem to have just returned from the battlefield.";
-					mes "It's too early for you to go back. Go rest, and leave the enemies to us!";
-				}
-				else {
-					if (.@chk_urtime == 2)
-						erasequest 2069;
-					set .@mapcount,getmapusers("bat_a02");
-					if (.@mapcount > 0) {
-						mes "[Croix Army Officer]";
-						mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already.";
-						mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
-					}
-					else {
-						if ($@TierraBG1) {
-							mes "[Croix Army Officer]";
-							mes "An elite corps is already standing by to be dispatched to the battlefield.";
-							mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
-						}
-						else {
-							mes "[Croix Army Officer]";
-							mes "You definitely seem to be ready for battle!";
-							mes "Go show the Guillaumes what fear truly means!";
-							mes "Today, our cry of victory shall echo all over the battlefield!";
-							close2;
-							warp "bat_room",57,207;
-							end;
-						}
-					}
-				}
-			}
+		if (BaseLevel < 80) {
+			mes "[Croix Army Officer]";
+			mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
+			break;
 		}
-		break;
+		.@chk_urtime = questprogress(2069,PLAYTIME);
+		if (.@chk_urtime == 1) {
+			mes "[Croix Army Officer]";
+			mes "You seem to have just returned from the battlefield.";
+			mes "It's too early for you to go back. Go rest, and leave the enemies to us!";
+			break;
+		}
+		if (.@chk_urtime == 2)
+			erasequest 2069;
+		if (getmapusers("bat_a02") > 0) {
+			mes "[Croix Army Officer]";
+			mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already.";
+			mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
+			break;
+		}
+		if ($@TierraBG1) {
+			mes "[Croix Army Officer]";
+			mes "An elite corps is already standing by to be dispatched to the battlefield.";
+			mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
+			break;
+		}
+		mes "[Croix Army Officer]";
+		mes "You definitely seem to be ready for battle!";
+		mes "Go show the Guillaumes what fear truly means!";
+		mes "Today, our cry of victory shall echo all over the battlefield!";
+		close2;
+		warp "bat_room",57,207;
+		end;
 	case 2:
 		mes "[Croix Army Officer]";
 		mes "Today, we shall be victorious!";
@@ -330,48 +309,41 @@ bat_room,140,121,1	script	Tierra Gorge Officer#02b	4_M_CRU_KNT,{
 		if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) {
 			mes "[Croix Army Officer]";
 			mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
+			break;
 		}
-		else {
-			if (BaseLevel < 80) {
-				mes "[Croix Army Officer]";
-				mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
-			}
-			else {
-				set .@chk_urtime,checkquest(2069,PLAYTIME);
-				if (.@chk_urtime == 1) {
-					mes "[Croix Army Officer]";
-					mes "You seem to have just returned from the battlefield.";
-					mes "It's too early for you to go back. Go rest, and leave the enemies to us!";
-				}
-				else {
-					if (.@chk_urtime == 2)
-						erasequest 2069;
-					set .@mapcount,getmapusers("bat_a02");
-					if (.@mapcount > 0) {
-						mes "[Croix Army Officer]";
-						mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already.";
-						mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
-					}
-					else {
-						if ($@TierraBG2) {
-							mes "[Croix Army Officer]";
-							mes "An elite corps is already standing by to be dispatched to the battlefield.";
-							mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
-						}
-						else {
-							mes "[Croix Army Officer]";
-							mes "You definitely seem to be ready for battle!";
-							mes "Go show the Guillaumes what fear truly means!";
-							mes "Today, our cry of victory shall echo all over the battlefield!";
-							close2;
-							warp "bat_room",114,207;
-							end;
-						}
-					}
-				}
-			}
+		if (BaseLevel < 80) {
+			mes "[Croix Army Officer]";
+			mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
+			break;
 		}
-		break;
+		.@chk_urtime = questprogress(2069,PLAYTIME);
+		if (.@chk_urtime == 1) {
+			mes "[Croix Army Officer]";
+			mes "You seem to have just returned from the battlefield.";
+			mes "It's too early for you to go back. Go rest, and leave the enemies to us!";
+			break;
+		}
+		if (.@chk_urtime == 2)
+			erasequest 2069;
+		if (getmapusers("bat_a02") > 0) {
+			mes "[Croix Army Officer]";
+			mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already.";
+			mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
+			break;
+		}
+		if ($@TierraBG2) {
+			mes "[Croix Army Officer]";
+			mes "An elite corps is already standing by to be dispatched to the battlefield.";
+			mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then.";
+			break;
+		}
+		mes "[Croix Army Officer]";
+		mes "You definitely seem to be ready for battle!";
+		mes "Go show the Guillaumes what fear truly means!";
+		mes "Today, our cry of victory shall echo all over the battlefield!";
+		close2;
+		warp "bat_room",114,207;
+		end;
 	case 2:
 		mes "[Croix Army Officer]";
 		mes "Today, we shall be victorious!";
diff --git a/npc/custom/battleground/bg_common.txt b/npc/custom/battleground/bg_common.txt
index 895191961..8b99deb39 100644
--- a/npc/custom/battleground/bg_common.txt
+++ b/npc/custom/battleground/bg_common.txt
@@ -217,9 +217,9 @@ bat_room,156,178,5	script	Tierra Valley Officer#1	4_M_KY_KNT,{
 		close;
 	}
 
-	if( checkquest(2069,PLAYTIME) == 2 ) erasequest 2069;
-	if( checkquest(2069,PLAYTIME) != -1 )
-	{
+	if (questprogress(2069,PLAYTIME) == 2)
+		erasequest 2069;
+	if (questprogress(2069,PLAYTIME)) {
 		mes "You have received an indicator showing that you've participated in the Battle at Tierra Gorge. I can't let you participate in any other battles until the indicator goes off.";
 		next;
 		mes "[Tierra Officer]";
@@ -287,9 +287,9 @@ bat_room,156,121,1	script	Tierra Valley Officer#2	4_M_CRU_KNT,{
 		close;
 	}
 
-	if( checkquest(2069,PLAYTIME) == 2 ) erasequest 2069;
-	if( checkquest(2069,PLAYTIME) != -1 )
-	{
+	if (questprogress(2069,PLAYTIME) == 2)
+		erasequest 2069;
+	if (questprogress(2069,PLAYTIME)) {
 		mes "You have received an indicator showing that you've participated in the Battle at Tierra Gorge. I can't let you participate in any other battles until the indicator goes off.";
 		next;
 		mes "[Tierra Officer]";
@@ -357,9 +357,9 @@ bat_room,164,178,5	script	Tierra Valley Officer#3	4_M_KY_KNT,{
 		close;
 	}
 
-	if( checkquest(2069,PLAYTIME) == 2 ) erasequest 2069;
-	if( checkquest(2069,PLAYTIME) != -1 )
-	{
+	if (questprogress(2069,PLAYTIME) == 2)
+		erasequest 2069;
+	if (questprogress(2069,PLAYTIME)) {
 		mes "You have received an indicator showing that you've participated in the Battle at Tierra Gorge. I can't let you participate in any other battles until the indicator goes off.";
 		next;
 		mes "[Tierra Officer]";
@@ -427,9 +427,9 @@ bat_room,164,121,1	script	Tierra Valley Officer#4	4_M_CRU_KNT,{
 		close;
 	}
 
-	if( checkquest(2069,PLAYTIME) == 2 ) erasequest 2069;
-	if( checkquest(2069,PLAYTIME) != -1 )
-	{
+	if (questprogress(2069,PLAYTIME) == 2)
+		erasequest 2069;
+	if (questprogress(2069,PLAYTIME)) {
 		mes "You have received an indicator showing that you've participated in the Battle at Tierra Gorge. I can't let you participate in any other battles until the indicator goes off.";
 		next;
 		mes "[Tierra Officer]";
@@ -498,9 +498,9 @@ bat_room,172,178,5	script	Flavius Officer#1	4_M_KY_KNT,{
 		close;
 	}
 
-	if( checkquest(2070,PLAYTIME) == 2 ) erasequest 2070;
-	if( checkquest(2070,PLAYTIME) != -1 )
-	{
+	if (questprogress(2070,PLAYTIME) == 2)
+		erasequest 2070;
+	if (questprogress(2070,PLAYTIME)) {
 		mes "You have received an indicator showing that you've participated in the Battle at Flavius. I can't let you participate in any other battles until the indicator goes off.";
 		next;
 		mes "[Flavius Officer]";
@@ -569,9 +569,9 @@ bat_room,172,121,1	script	Flavius Officer#2	4_M_CRU_KNT,{
 		close;
 	}
 
-	if( checkquest(2070,PLAYTIME) == 2 ) erasequest 2070;
-	if( checkquest(2070,PLAYTIME) != -1 )
-	{
+	if (questprogress(2070,PLAYTIME) == 2)
+		erasequest 2070;
+	if (questprogress(2070,PLAYTIME)) {
 		mes "You have received an indicator showing that you've participated in the Battle at Flavius. I can't let you participate in any other battles until the indicator goes off.";
 		next;
 		mes "[Flavius Officer]";
@@ -640,9 +640,9 @@ bat_room,148,178,5	script	Flavius Officer#3	4_M_KY_KNT,{
 		close;
 	}
 
-	if( checkquest(2070,PLAYTIME) == 2 ) erasequest 2070;
-	if( checkquest(2070,PLAYTIME) != -1 )
-	{
+	if (questprogress(2070,PLAYTIME) == 2)
+		erasequest 2070;
+	if (questprogress(2070,PLAYTIME)) {
 		mes "You have received an indicator showing that you've participated in the Battle at Flavius. I can't let you participate in any other battles until the indicator goes off.";
 		next;
 		mes "[Flavius Officer]";
@@ -711,9 +711,9 @@ bat_room,148,121,1	script	Flavius Officer#4	4_M_CRU_KNT,{
 		close;
 	}
 
-	if( checkquest(2070,PLAYTIME) == 2 ) erasequest 2070;
-	if( checkquest(2070,PLAYTIME) != -1 )
-	{
+	if (questprogress(2070,PLAYTIME) == 2)
+		erasequest 2070;
+	if (questprogress(2070,PLAYTIME)) {
 		mes "You have received an indicator showing that you've participated in the Battle at Flavius. I can't let you participate in any other battles until the indicator goes off.";
 		next;
 		mes "[Flavius Officer]";
@@ -779,9 +779,9 @@ bat_room,140,178,5	script	KVM [80-99] Officer#1	4_M_KY_KNT,{
 		close;
 	}
 
-	if( checkquest(6025,PLAYTIME) == 2 ) erasequest 6025;
-	if( checkquest(6025,PLAYTIME) != -1 )
-	{
+	if (questprogress(6025,PLAYTIME) == 2)
+		erasequest 6025;
+	if (questprogress(6025,PLAYTIME)) {
 		mes "You have received an indicator showing that you've participated in the Battle at KvM. I can't let you participate in any other battles until the indicator goes off.";
 		next;
 		mes "[KVM Officer]";
@@ -847,9 +847,9 @@ bat_room,140,121,1	script	KVM [80-99] Officer#2	4_M_CRU_KNT,{
 		close;
 	}
 
-	if( checkquest(6025,PLAYTIME) == 2 ) erasequest 6025;
-	if( checkquest(6025,PLAYTIME) != -1 )
-	{
+	if (questprogress(6025,PLAYTIME) == 2)
+		erasequest 6025;
+	if (questprogress(6025,PLAYTIME)) {
 		mes "You have received an indicator showing that you've participated in the Battle at KvM. I can't let you participate in any other battles until the indicator goes off.";
 		next;
 		mes "[KVM Officer]";
@@ -915,9 +915,9 @@ bat_room,132,178,5	script	KVM [60-79] Officer#1	4_M_KY_KNT,{
 		close;
 	}
 
-	if( checkquest(6025,PLAYTIME) == 2 ) erasequest 6025;
-	if( checkquest(6025,PLAYTIME) != -1 )
-	{
+	if (questprogress(6025,PLAYTIME) == 2)
+		erasequest 6025;
+	if (questprogress(6025,PLAYTIME)) {
 		mes "You have received an indicator showing that you've participated in the Battle at KvM. I can't let you participate in any other battles until the indicator goes off.";
 		next;
 		mes "[KVM Officer]";
@@ -983,9 +983,9 @@ bat_room,132,121,1	script	KVM [60-79] Officer#2	4_M_CRU_KNT,{
 		close;
 	}
 
-	if( checkquest(6025,PLAYTIME) == 2 ) erasequest 6025;
-	if( checkquest(6025,PLAYTIME) != -1 )
-	{
+	if (questprogress(6025,PLAYTIME) == 2)
+		erasequest 6025;
+	if (questprogress(6025,PLAYTIME)) {
 		mes "You have received an indicator showing that you've participated in the Battle at KvM. I can't let you participate in any other battles until the indicator goes off.";
 		next;
 		mes "[KVM Officer]";
@@ -1051,9 +1051,9 @@ bat_room,124,178,5	script	KVM [1-59] Officer#1	4_M_KY_KNT,{
 		close;
 	}
 
-	if( checkquest(6025,PLAYTIME) == 2 ) erasequest 6025;
-	if( checkquest(6025,PLAYTIME) != -1 )
-	{
+	if (questprogress(6025,PLAYTIME) == 2)
+		erasequest 6025;
+	if (questprogress(6025,PLAYTIME)) {
 		mes "You have received an indicator showing that you've participated in the Battle at KvM. I can't let you participate in any other battles until the indicator goes off.";
 		next;
 		mes "[KVM Officer]";
@@ -1119,9 +1119,9 @@ bat_room,124,121,1	script	KVM [1-59] Officer#2	4_M_CRU_KNT,{
 		close;
 	}
 
-	if( checkquest(6025,PLAYTIME) == 2 ) erasequest 6025;
-	if( checkquest(6025,PLAYTIME) != -1 )
-	{
+	if (questprogress(6025,PLAYTIME) == 2)
+		erasequest 6025;
+	if (questprogress(6025,PLAYTIME)) {
 		mes "You have received an indicator showing that you've participated in the Battle at KvM. I can't let you participate in any other battles until the indicator goes off.";
 		next;
 		mes "[KVM Officer]";
diff --git a/npc/custom/bgqueue/flavius.txt b/npc/custom/bgqueue/flavius.txt
index 36e02e86d..8112be12e 100644
--- a/npc/custom/bgqueue/flavius.txt
+++ b/npc/custom/bgqueue/flavius.txt
@@ -426,14 +426,14 @@ OnTouch:
 
 bat_b01,87,76,0	script	A_CODE#bat_b01	-1,5,5,{
 OnTouch:
-	if (checkquest(2070) < 0)
+	if (!questprogress(2070))
 		setquest 2070;
 	end;
 }
 
 bat_b01,312,224,0	script	B_CODE#bat_b01	-1,5,5,{
 OnTouch:
-	if (checkquest(2070) < 0)
+	if (!questprogress(2070))
 		setquest 2070;
 	end;
 }
diff --git a/npc/events/RWC_2011.txt b/npc/events/RWC_2011.txt
index 992bd7bd3..4f0a05b86 100644
--- a/npc/events/RWC_2011.txt
+++ b/npc/events/RWC_2011.txt
@@ -207,8 +207,8 @@ prontera,114,81,5	script	RWC2011 Agent#2	4_M_ATEIL,{
 			close;
 		}
 	} else if (oversea_event == 2) {
-		set .@playtime, checkquest(13001,PLAYTIME);
-		if (.@playtime == 0 || .@playtime == 1) {
+		.@playtime = questprogress(13001,PLAYTIME);
+		if (.@playtime == 1) {
 			mes "[RWC2011 Agent]";
 			mes "First, I will start attaching cards you found... I'll take the rest of cards tomorrow.";
 			mes "Please come back tomorrow.";
diff --git a/npc/events/easter_2010.txt b/npc/events/easter_2010.txt
index 292b91948..8276e0774 100644
--- a/npc/events/easter_2010.txt
+++ b/npc/events/easter_2010.txt
@@ -36,8 +36,8 @@ prontera,202,297,3	script	Rina#Easter	4_F_JOB_HUNTER,{
 		mes "Take care~!";
 		close;
 	}
-	set .@quest1, checkquest(9117);
-	if (.@quest1 == -1) {
+	.@quest1 = questprogress(9117);
+	if (!.@quest1) {
 		playbgm "30.mp3"; // One Step Closer
 		mes "[Rina]";
 		mes "Hi~!";
@@ -96,7 +96,7 @@ prontera,202,297,3	script	Rina#Easter	4_F_JOB_HUNTER,{
 		mes "Let me know when you are ready.";
 		setquest 9117;
 		close;
-	} else if (.@quest1 == 0 || .@quest1 == 1) {
+	} else if (.@quest1 == 1) {
 	L_HuntingInfo:
 		mes "[Rina]";
 		mes "What you need to do is";
@@ -123,8 +123,8 @@ prontera,202,297,3	script	Rina#Easter	4_F_JOB_HUNTER,{
 		npcskill "AL_BLESSING",1,0,0;
 		end;
 	} else if (.@quest1 == 2) {
-		if (checkquest(9118) < 2 || checkquest(9119) < 2 || checkquest(9120) < 2 || checkquest(9121) < 2) {
-			if (checkquest(9118,HUNTING) == 2 || checkquest(9119,HUNTING) == 2 || checkquest(9120,HUNTING) == 2 || checkquest(9121,HUNTING) == 2) {
+		if (questprogress(9118) != 2 || questprogress(9119) != 2 || questprogress(9120) != 2 || questprogress(9121) != 2) {
+			if (questprogress(9118,HUNTING) == 2 || questprogress(9119,HUNTING) == 2 || questprogress(9120,HUNTING) == 2 || questprogress(9121,HUNTING) == 2) {
 				mes "[Rina]";
 				mes "You did it.";
 				mes "I can feel that my body is recovering.";
@@ -144,8 +144,7 @@ prontera,202,297,3	script	Rina#Easter	4_F_JOB_HUNTER,{
 			end;
 		}
 	}
-	set .@quest2, checkquest(9122);
-	if (.@quest2 == 0 || .@quest2 == 1) {
+	if (questprogress(9122) == 1) {
 		mes "[Rina]";
 		mes "I will check one thing.";
 		mes "For this task,";
@@ -215,87 +214,84 @@ prontera,202,297,3	script	Rina#Easter	4_F_JOB_HUNTER,{
 		close2;
 		emotion e_sigh;
 		end;
-	} else {
-		set .@quest3, checkquest(9123);
-		if (.@quest3 == 0 || .@quest3 == 1) {
-			emotion e_kis;
+	}
+	if (questprogress(9123) == 1) {
+		emotion e_kis;
+		mes "[Rina]";
+		mes "You're back~!";
+		mes "My curse has been released.";
+		mes "Thank you so much.";
+		next;
+		if (checkweight(5852,1) == 0) {
 			mes "[Rina]";
-			mes "You're back~!";
-			mes "My curse has been released.";
-			mes "Thank you so much.";
-			next;
-			if (checkweight(5852,1) == 0) {
-				mes "[Rina]";
-				mes "Your bag is too full.";
-				mes "I have a present for you";
-				mes "so make your bag lighter.";
-				mes "I'll wait for you.";
-				close;
-			}
-			completequest 9123;
-			getitem 5852,1; //Easter_Egg_Shell
-			set .@BaseExp, (BaseLevel * (BaseLevel / 4)) * ((BaseLevel / 29) + (BaseLevel / 6)) + (5 * BaseLevel / 2);
-			if (ADVJOB == 0) {
-				     if (BaseLevel < 40) set .@nBaseExp, .@BaseExp;
-				else if (BaseLevel < 50) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel);
-				else if (BaseLevel < 60) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 20));
-				else if (BaseLevel < 70) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10));
-				else if (BaseLevel < 80) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5));
-				else if (BaseLevel < 90) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3));
-				else if (BaseLevel < 99) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2));
-				else set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2) * 2);
-
-				set .@nJobExp, (JobLevel * (JobLevel - 3) * (JobLevel / 25 + 1) + (16 - (JobLevel * 2))) * 2;
-			} else {
-				     if (BaseLevel < 30) set .@nBaseExp, .@BaseExp;
-				else if (BaseLevel < 40) set .@nBaseExp, .@BaseExp + (BaseLevel * 10);
-				else if (BaseLevel < 50) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * 2);
-				else if (BaseLevel < 60) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10));
-				else if (BaseLevel < 70) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5));
-				else if (BaseLevel < 80) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3));
-				else if (BaseLevel < 90) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2));
-				else if (BaseLevel < 98) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * BaseLevel);
-				else set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * BaseLevel * 2);
+			mes "Your bag is too full.";
+			mes "I have a present for you";
+			mes "so make your bag lighter.";
+			mes "I'll wait for you.";
+			close;
+		}
+		completequest 9123;
+		getitem 5852,1; //Easter_Egg_Shell
+		.@BaseExp = (BaseLevel * (BaseLevel / 4)) * ((BaseLevel / 29) + (BaseLevel / 6)) + (5 * BaseLevel / 2);
+		if (ADVJOB == 0) {
+			if (BaseLevel < 40) set .@nBaseExp, .@BaseExp;
+			else if (BaseLevel < 50) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel);
+			else if (BaseLevel < 60) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 20));
+			else if (BaseLevel < 70) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10));
+			else if (BaseLevel < 80) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5));
+			else if (BaseLevel < 90) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3));
+			else if (BaseLevel < 99) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2));
+			else set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2) * 2);
 
-				set .@nJobExp, (JobLevel * JobLevel * (JobLevel / 5 + 2) + (20 - JobLevel)) * 3;
-			}
-			getexp .@nBaseExp,.@nJobExp;
-			mes "[Rina]";
-			mes "This is the present for you.";
-			mes "It's not a big one";
-			mes "but please take it";
-			mes "as a token of my gratitude.";
-			next;
-			mes "[Rina]";
-			mes "I'll take a rest for a few days";
-			mes "and then I'll go on an adventure.";
-			mes "See you again.";
-			close2;
-			consumeitem 607; //Yggdrasilberry
-			consumeitem 12068; //Luk_Dish03
-			consumeitem 12063; //Dex_Dish03
-			consumeitem 12053; //Vit_Dish03
-			npcskill "AL_INCAGI",1,0,0;
-			npcskill "AL_BLESSING",1,0,0;
-			end;
+			set .@nJobExp, (JobLevel * (JobLevel - 3) * (JobLevel / 25 + 1) + (16 - (JobLevel * 2))) * 2;
 		} else {
-			mes "[Rina]";
-			mes "Thank you for releasing my curse.";
-			mes "I'll take a rest for a few days";
-			mes "and then go on an adventure again.";
-			mes "Have a happy day~!";
-			close2;
-			consumeitem 607; //Yggdrasilberry
-			npcskill "AL_INCAGI",1,0,0;
-			npcskill "AL_BLESSING",1,0,0;
-			end;
+			if (BaseLevel < 30) set .@nBaseExp, .@BaseExp;
+			else if (BaseLevel < 40) set .@nBaseExp, .@BaseExp + (BaseLevel * 10);
+			else if (BaseLevel < 50) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * 2);
+			else if (BaseLevel < 60) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10));
+			else if (BaseLevel < 70) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5));
+			else if (BaseLevel < 80) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3));
+			else if (BaseLevel < 90) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2));
+			else if (BaseLevel < 98) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * BaseLevel);
+			else set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * BaseLevel * 2);
+
+			set .@nJobExp, (JobLevel * JobLevel * (JobLevel / 5 + 2) + (20 - JobLevel)) * 3;
 		}
+		getexp .@nBaseExp,.@nJobExp;
+		mes "[Rina]";
+		mes "This is the present for you.";
+		mes "It's not a big one";
+		mes "but please take it";
+		mes "as a token of my gratitude.";
+		next;
+		mes "[Rina]";
+		mes "I'll take a rest for a few days";
+		mes "and then I'll go on an adventure.";
+		mes "See you again.";
+		close2;
+		consumeitem 607; //Yggdrasilberry
+		consumeitem 12068; //Luk_Dish03
+		consumeitem 12063; //Dex_Dish03
+		consumeitem 12053; //Vit_Dish03
+		npcskill "AL_INCAGI",1,0,0;
+		npcskill "AL_BLESSING",1,0,0;
+		end;
 	}
+	mes "[Rina]";
+	mes "Thank you for releasing my curse.";
+	mes "I'll take a rest for a few days";
+	mes "and then go on an adventure again.";
+	mes "Have a happy day~!";
+	close2;
+	consumeitem 607; //Yggdrasilberry
+	npcskill "AL_INCAGI",1,0,0;
+	npcskill "AL_BLESSING",1,0,0;
+	end;
 }
 
 geffen,207,114,4	script	#Hiddne01Easter	CLEAR_NPC,{
 	if (oversea_event2 > 519) {
-	OnRelease:
+OnRelease:
 		specialeffect EF_PATTACK;
 		mes "- I found ^0000FFthe strange mark^000000. -";
 		next;
@@ -304,7 +300,7 @@ geffen,207,114,4	script	#Hiddne01Easter	CLEAR_NPC,{
 		mes "- ^0000FFRina^000000 has been released";
 		mes "- from the curse.";
 		mes "- ^006400Let's go back to Rina!^000000";
-		if (checkquest(9122) < 2) {
+		if (questprogress(9122) != 2) {
 			completequest 9122;
 			setquest 9123;
 		}
@@ -333,7 +329,7 @@ rachel,36,132,4	script	#Hiddne04Easter	CLEAR_NPC,{
 
 prontera,204,297,3	script	Rina's Little Friend	4_DRAGON_EGG,{
 	disable_items;
-	if (checkquest(9117) == -1) {
+	if (!questprogress(9117)) {
 		emotion e_swt2;
 		mes "[Rina's Little Friend]";
 		mes ".......";
@@ -341,7 +337,7 @@ prontera,204,297,3	script	Rina's Little Friend	4_DRAGON_EGG,{
 		mes "^787878( No response. )^000000";
 		close;
 	}
-	if (checkquest(9123) == 2) {
+	if (questprogress(9123) == 2) {
 		emotion e_meh;
 		mes "[Rina's Little Friend]";
 		mes "Hi.";
diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt
index 22d30e12c..1a69fea76 100644
--- a/npc/events/gdevent_aru.txt
+++ b/npc/events/gdevent_aru.txt
@@ -63,8 +63,8 @@ arug_dun01,199,195,5	script	Dwarf#aru_gd	4_M_DWARF,{
 		mes "Hey did you see an ugly Goblin come by? He stole something from me!";
 		close;
 	}
-	set .@chk_urquest,checkquest(2143,PLAYTIME);
-	set .@chk_yourgdname$,getguildname(getcharid(2));
+	.@chk_urquest = questprogress(2143,PLAYTIME);
+	.@chk_yourgdname$ = getguildname(getcharid(2));
 	if ($@gdeventv_a1 == 0) {
 		if ($@gdevents_a$ == "") {
 			set $@gdeventv_a1,1;
@@ -178,8 +178,7 @@ arug_dun01,199,195,5	script	Dwarf#aru_gd	4_M_DWARF,{
 			}
 		}
 		else if ($@gdevents_a$ == .@chk_yourgdname$) {
-			set .@chk_urquest1,checkquest(2144);
-			if ((.@chk_urquest1 == 0) || (.@chk_urquest1 == 1)) {
+			if (questprogress(2144) == 1) {
 				mes "[Morestone]";
 				mes "I, Morestone, have made an alliance with the "+$@gdevents_a$+" guild.";
 				mes "Oh, you are a member.";
@@ -321,8 +320,7 @@ arug_dun01,199,195,5	script	Dwarf#aru_gd	4_M_DWARF,{
 	}
 	else {
 		if ($@gdevents_a$ == .@chk_yourgdname$) {
-			set .@chk_urquest1,checkquest(2144);
-			if ((.@chk_urquest1 == 0) || (.@chk_urquest1 == 1)) {
+			if (questprogress(2144) == 1) {
 				mes "[Morestone]";
 				mes "[Morestone]";
 				mes "I, Morestone, have made an alliance with the "+$@gdevents_a$+" guild.";
@@ -504,8 +502,8 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	4_M_PIERROT,{
 	}
 	if (strcharinfo(0) == getguildmaster(getcharid(2))) {
 		if ($@gdeventv_a2 == 0) {
-			set .@que_2143,checkquest(2143,PLAYTIME);
-			if (.@que_2143 == -1) {
+			set .@que_2143,questprogress(2143,PLAYTIME);
+			if (!.@que_2143) {
 				setnpcdisplay "Pierrot Pier#aru_gd", 4_M_PIERROT;
 				mes "A lonely clown is juggling.";
 				next;
@@ -589,7 +587,7 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	4_M_PIERROT,{
 				donpcevent "Gergath#aru_gd::OnEnable";
 				close;
 			}
-			else if ((.@que_2143 == 0) || (.@que_2143 == 1)) {
+			else if (.@que_2143 == 1) {
 				mes "[Pierrot Pier]";
 				mes "Let's talk after I finished reading my master's message. Beep beep.";
 				close;
@@ -767,8 +765,7 @@ arug_que01,100,81,3	script	Pierrot Pier#aru_gd	4_M_PIERROT,{
 			}
 		}
 		else if ($@gdeventv_a2 == 3) {
-			set .@que_2143,checkquest(2143);
-			if (.@que_2143 == 3) {
+			if (questprogress(2143) == 2) {
 				erasequest 2143;
 			}
 			mes "[Pierrot Pier]";
diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt
index 31537763e..a6df13889 100644
--- a/npc/events/gdevent_sch.txt
+++ b/npc/events/gdevent_sch.txt
@@ -63,8 +63,8 @@ schg_dun01,194,148,5	script	Dwarf#sch_gd	4_M_DWARF,{
 		mes "Hey did you see an ugly Goblin come by? He stole something from me!";
 		close;
 	}
-	set .@chk_urquest,checkquest(2143,PLAYTIME);
-	set .@chk_yourgdname$,getguildname(getcharid(2));
+	.@chk_urquest = questprogress(2143,PLAYTIME);
+	.@chk_yourgdname$ = getguildname(getcharid(2));
 	if ($@gdeventv_s1 == 0) {
 		if ($@gdevents_s$ == "") {
 			set $@gdeventv_s1,1;
@@ -178,8 +178,7 @@ schg_dun01,194,148,5	script	Dwarf#sch_gd	4_M_DWARF,{
 			}
 		}
 		else if ($@gdevents_s$ == .@chk_yourgdname$) {
-			set .@chk_urquest1,checkquest(2144);
-			if ((.@chk_urquest1 == 0) || (.@chk_urquest1 == 1)) {
+			if (questprogress(2144) == 1) {
 				mes "[Morestone]";
 				mes "I, Morestone, have made an alliance with the "+$@gdevents_s$+" guild.";
 				mes "Oh, you are a member.";
@@ -321,8 +320,7 @@ schg_dun01,194,148,5	script	Dwarf#sch_gd	4_M_DWARF,{
 	}
 	else {
 		if ($@gdevents_s$ == .@chk_yourgdname$) {
-			set .@chk_urquest1,checkquest(2144);
-			if ((.@chk_urquest1 == 0) || (.@chk_urquest1 == 1)) {
+			if (questprogress(2144) == 1) {
 				mes "[Morestone]";
 				mes "I, Morestone, have made an alliance with the "+$@gdevents_s$+" guild.";
 				mes "Oh, you are a member.";
@@ -503,8 +501,8 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	4_M_PIERROT,{
 	}
 	if (strcharinfo(0) == getguildmaster(getcharid(2))) {
 		if ($@gdeventv_s2 == 0) {
-			set .@que_2143,checkquest(2143,PLAYTIME);
-			if (.@que_2143 == -1) {
+			.@que_2143 = questprogress(2143,PLAYTIME);
+			if (!.@que_2143) {
 				setnpcdisplay "Pierrot Pier#sch_gd", 4_M_PIERROT;
 				mes "A lonely clown is juggling.";
 				next;
@@ -588,7 +586,7 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	4_M_PIERROT,{
 				donpcevent "Gergath#sch_gd::OnEnable";
 				close;
 			}
-			else if ((.@que_2143 == 0) || (.@que_2143 == 1)) {
+			else if (.@que_2143 == 1) {
 				mes "[Pierrot Pier]";
 				mes "Let's talk after I finished reading my master's message. Beep beep.";
 				close;
@@ -766,8 +764,7 @@ schg_que01,100,81,3	script	Pierrot Pier#sch_gd	4_M_PIERROT,{
 			}
 		}
 		else if ($@gdeventv_s2 == 3) {
-			set .@que_2143,checkquest(2143);
-			if (.@que_2143 == 3) {
+			if (questprogress(2143) == 2) {
 				erasequest 2143;
 			}
 			mes "[Pierrot Pier]";
diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index 2da7c8719..8da1d93c7 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -213,14 +213,14 @@ e_tower,81,105,0	script	Tower Protection Stone	2_MONEMUS,{
 	set .@p_name$,getpartyname(.@party_id);
 	set .@md_name$,"Endless Tower";
 
-	set .@etower_timer,checkquest(60200,PLAYTIME); // 1 week
-	set .@etower_timer2,checkquest(60201,PLAYTIME); // 4 hours
+	.@etower_timer = questprogress(60200,PLAYTIME); // 1 week
+	.@etower_timer2 = questprogress(60201,PLAYTIME); // 4 hours
 
 	if (!instance_check_party(.@party_id,2)) {
 		mes "Make or join a party with more than 1 member and try again.";
 		close;
 	}
-	if (.@etower_timer == -1) {
+	if (!.@etower_timer) {
 		if (getcharid(0) == getpartyleader(.@party_id,2)) {
 			mes "Confirmed the party has been made. Would you like to reserve entrance to the Endless Tower?";
 			next;
@@ -267,7 +267,7 @@ e_tower,81,105,0	script	Tower Protection Stone	2_MONEMUS,{
 		case 3:
 			end;
 		}
-	} else if ((.@etower_timer >= 0) && (.@etower_timer2 < 2)) {
+	} else if (.@etower_timer == 1) {
 		mes "If you have the dungeon generated already, you can enter it. ";
 		next;
 		switch(select("Enter the "+.@md_name$+":Return to Alberta:Cancel")) {
@@ -282,7 +282,7 @@ e_tower,81,105,0	script	Tower Protection Stone	2_MONEMUS,{
 			break;
 		}
 		close;
-	} else if ((.@etower_timer >= 0) && (.@etower_timer < 2) && (.@etower_timer2 == 2)) {
+	} else if (.@etower_timer == 1 && .@etower_timer2 == 2) {
 
 		set .@dun_lim_time,etower_timer+604800; // 1 week
 		set .@dun_lim_time2,etower_timer+14400; // 4 hours
diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt
index 9ccdade10..ada2bde55 100644
--- a/npc/instances/NydhoggsNest.txt
+++ b/npc/instances/NydhoggsNest.txt
@@ -92,12 +92,12 @@ nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	HIDDEN_NPC,8,8,{
 		set .@party_id,getcharid(1);
 		set .@md_name$,"Nidhoggur's Nest";
 
-		set .@ins_nyd_check,checkquest(3135,PLAYTIME); // 3 Day cooldown
-		set .@ins_nyd_check2,checkquest(3136,PLAYTIME); // 4 Hour play limit
+		.@ins_nyd_check = questprogress(3135,PLAYTIME); // 3 Day cooldown
+		.@ins_nyd_check2 = questprogress(3136,PLAYTIME); // 4 Hour play limit
 
 		mes "As I put my hands on the stone gate, a voice sounded from the depth of my heart.";
 		next;
-		if (.@ins_nyd_check == -1 && .@ins_nyd_check2 == -1) {
+		if (!.@ins_nyd_check && !.@ins_nyd_check2) {
 			if (!instance_check_party(.@party_id,2,70)) {
 				mes "[Yggdrasil Gatekeeper]";
 				mes "Where are the other servants, so you can work together? Each servant cannot be admitted here individually...";
@@ -150,7 +150,7 @@ nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	HIDDEN_NPC,8,8,{
 				close;
 			goto L_Enter;
 		} else {
-			if (.@ins_nyd_check == 0 || .@ins_nyd_check == 1) {
+			if (.@ins_nyd_check == 1) {
 				if ('ins_nyd2 == 3 || 'ins_nyd2 == 4) {
 					mes "[Yggdrasil Gatekeeper]";
 					mes "With the defeat of Nidhoggur's Shadow, the roots of the World Tree Yggdrasil are also affected.";
@@ -166,7 +166,7 @@ nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	HIDDEN_NPC,8,8,{
 					close;
 				goto L_Enter;
 			} else if (.@ins_nyd_check == 2) {
-				if (.@ins_nyd_check2 == 0 || .@ins_nyd_check2 == 1) {
+				if (.@ins_nyd_check2 == 1) {
 					mes "[Yggdrasil Gatekeeper]";
 					mes "The time limit to enter the dungeon has expired. You must wait for the World Tree to stabilize its power before trying to re-enter.";
 					close;
@@ -210,8 +210,8 @@ L_Enter:
 		close;
 	} else {
 		mapannounce "nyd_dun02", getpartyname(getcharid(1))+"'s party member "+strcharinfo(0)+" has entered Nidhoggur's Nest.",bc_map,"0x00ff99";
-		if (checkquest(3135) == -1) setquest 3135;
-		if (checkquest(3136) == -1) setquest 3136;
+		if (!questprogress(3135)) setquest 3135;
+		if (!questprogress(3136)) setquest 3136;
 		warp "1@nyd",32,37;
 		close;
 	}
diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt
index 55f88f99d..4ed546b1e 100644
--- a/npc/instances/OrcsMemory.txt
+++ b/npc/instances/OrcsMemory.txt
@@ -51,8 +51,8 @@ gef_fild10,242,202,0	script	Dimensional Gorge Piece	2_MONEMUS,{
 		close;
 	}
 
-	set .@orctime,checkquest(12059,PLAYTIME);
-	if (.@orctime == -1) {
+	.@orctime = questprogress(12059,PLAYTIME);
+	if (!.@orctime) {
 		if (getcharid(0) == getpartyleader(.@party_id,2)) {
 			mes "Party status confirmed. Would you like to book entrance to the "+.@md_name$+"?";
 			next;
@@ -87,7 +87,7 @@ gef_fild10,242,202,0	script	Dimensional Gorge Piece	2_MONEMUS,{
 		if(select(.@md_name$ + " Enter the Memorial Dungeon:Cancel") == 2)
 			end;
 		callsub L_Enter,1;
-	} else if (.@orctime == 0 || .@orctime == 1) {
+	} else if (.@orctime == 1) {
 		mes "You can enter the Dungeon if it has been generated.";
 		next;
 		if(select("Enter the Dungeon "+.@md_name$+":Cancel") == 2)
@@ -110,7 +110,7 @@ L_Enter:
 		close;
 	} else {
 		mapannounce "gef_fild10", .@p_leader$ + " of the party, " + .@p_name$ + " is entering the "+.@md_name$+".",bc_map,"0x00ff99";
-		if (checkquest(12059)== -1) setquest 12059;
+		if (!questprogress(12059)) setquest 12059;
 		warp "1@orcs",179,15;
 		end;
 	}
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index 215ceffeb..d85e8a4e4 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -106,11 +106,11 @@ monk_test,309,146,3	script	Friar Patrick#edq	4_M_OLDFRIAR,{
 			next;
 
 			// 12 hour cooldown
-			set .@ins_bapho_check,checkquest(3040,PLAYTIME);
+			.@ins_bapho_check = questprogress(3040,PLAYTIME);
 			// Two hour play limit
-			//set .@ins_bapho_check2,checkquest(3045,PLAYTIME);
+			//.@ins_bapho_check2 = questprogress(3045,PLAYTIME);
 
-			if (.@ins_bapho_check == -1) {
+			if (!.@ins_bapho_check) {
 				if (getpartyleader(.@party_id,2) == getcharid(0) && instance_check_party(.@party_id,2,75)) {
 					mes "[Friar Patrick]";
 					mes "Party name is "+getpartyname(.@party_id)+"...";
@@ -158,7 +158,7 @@ monk_test,309,146,3	script	Friar Patrick#edq	4_M_OLDFRIAR,{
 					mes "Once the party leader is permitted, the rest of the party can enter. This is a rule of this monastery, so please understand.";
 				}
 			}
-			else if (.@ins_bapho_check == 0 || .@ins_bapho_check == 1) {
+			else if (.@ins_bapho_check == 1) {
 				mes "[Friar Patrick]";
 				mes "It seems you have entered this shrine recently... You cannot reenter because Baphomet's Curse still remains. Baphomet's Curse disappears only after a certain amount of time has passed.";
 			}
@@ -170,8 +170,8 @@ monk_test,309,146,3	script	Friar Patrick#edq	4_M_OLDFRIAR,{
 				mes "Haaaaaaap... Hocus Pocus Wingardium Abracadabra!!!!!";
 				next;
 				erasequest 3040;
-				if (checkquest(3041)>=0) erasequest 3041;
-				if (checkquest(3045)>=0) erasequest 3045;
+				if (questprogress(3041)) erasequest 3041;
+				if (questprogress(3045)) erasequest 3045;
 				mes "[Friar Patrick]";
 				mes "Huu... It's over. Now that I've released Baphomet's Curse, you can enter again.";
 			}
@@ -224,11 +224,11 @@ monk_test,306,151,3	script	Grave of Baphomet#edq	HIDDEN_NPC,{
 		close;
 
 	// 12 hour cooldown
-	set .@ins_bapho_check,checkquest(3040,PLAYTIME);
+	.@ins_bapho_check = questprogress(3040,PLAYTIME);
 	// Two hour play limit
-	//set .@ins_bapho_check2,checkquest(3045,PLAYTIME);
+	//.@ins_bapho_check2 = questprogress(3045,PLAYTIME);
 
-	if (.@ins_bapho_check == -1) {
+	if (!.@ins_bapho_check) {
 		if (has_instance("1@cata") == "") {
 			mes "It's cold to the touch. It doesn't respond.";
 			close;
@@ -238,7 +238,7 @@ monk_test,306,151,3	script	Grave of Baphomet#edq	HIDDEN_NPC,{
 			warp "1@cata",100,224;
 			end;
 		}
-	} else if (.@ins_bapho_check == 0 || .@ins_bapho_check == 1) {
+	} else if (.@ins_bapho_check == 1) {
 		mes "[Friar Patrick]";
 		mes "It seems you have entered this shrine recently... You cannot reenter because the curse of Baphomet still remains.";
 		mes "The curse of Baphomet disappears after a certain amount of time after you entered.";
@@ -251,8 +251,8 @@ monk_test,306,151,3	script	Grave of Baphomet#edq	HIDDEN_NPC,{
 		mes "Haaaaaaap... Wingardium Leviosa Expecto Patronum !!!!!";
 		specialeffect2 EF_HOLYHIT;
 		erasequest 3040;
-		if (checkquest(3041)>=0) erasequest 3041;
-		if (checkquest(3045)>=0) erasequest 3045;
+		if (questprogress(3041)) erasequest 3041;
+		if (questprogress(3045)) erasequest 3045;
 		next;
 		mes "[Friar Patrick]";
 		mes "Huu... It's over. Now I released all of the curses on you. You can enter again.";
@@ -261,14 +261,14 @@ monk_test,306,151,3	script	Grave of Baphomet#edq	HIDDEN_NPC,{
 }
 
 prt_monk,261,91,3	script	Rust Blackhand#edq	4_M_DWARF,{
-	set .@new_maje,checkquest(3043);
+	.@new_maje = questprogress(3043);
 	mes "[Rust Blackhand]";
 	mes "Who are you? What do you want me for?";
 	next;
 	mes "[Rust Blackhand]";
 	mes "You're not a monk, then what do you want?";
 	next;
-	if (.@new_maje == 0 || .@new_maje == 1) {
+	if (.@new_maje == 1) {
 		mes "[Rust Blackhand]";
 		mes "Did you bring all of the ingredients?";
 		next;
@@ -311,7 +311,7 @@ prt_monk,261,91,3	script	Rust Blackhand#edq	4_M_DWARF,{
 			close;
 		}
 	}
-	else if ((.@new_maje == -1) && (countitem(6004) > 0)) {
+	else if (!.@new_maje && countitem(6004) > 0) {
 		switch(select("About the Cursed Baphomet Doll:Stop talking.")) {
 		case 1:
 			mes "[Rust Blackhand]";
@@ -364,12 +364,12 @@ prt_monk,261,91,3	script	Rust Blackhand#edq	4_M_DWARF,{
 			close;
 		}
 	}
-	else if ((.@new_maje == -1) && (countitem(6004) == 0)) {
+	else if (!.@new_maje && countitem(6004) == 0) {
 		mes "[Rust Blackhand]";
 		mes "If you don't have business with me, go away! As you see, I make equipment for the Brothers at the monastery, not for adventurers like you. Do you understand?";
 		close;
 	}
-	else if ((.@new_maje == 2) && (countitem(6004) > 0)) {
+	else if (.@new_maje == 2 && countitem(6004) > 0) {
 		switch(select("About the Cursed Baphomet Doll:Stop talking.")) {
 		case 1:
 			mes "[Rust Blackhand]";
@@ -420,7 +420,7 @@ prt_monk,261,91,3	script	Rust Blackhand#edq	4_M_DWARF,{
 			close;
 		}
 	}
-	else if ((.@new_maje == 2) && (countitem(6004) == 0)) {
+	else if (.@new_maje == 2 && countitem(6004) == 0) {
 		mes "[Rust Blackhand]";
 		mes "Why are you hanging around here? If you don't want a ^4d4dffGigantic Magestic Goat^000000, go away.";
 		close;
@@ -1084,8 +1084,8 @@ OnTouch:
 // Magical Seals
 //============================================================
 -	script	Magical Seal#SS	-1,{
-	set .@seal_check,checkquest(3041,PLAYTIME);
-	if (.@seal_check == 0 || .@seal_check == 1) {
+	.@seal_check = questprogress(3041,PLAYTIME);
+	if (.@seal_check == 1) {
 		specialeffect2 EF_SILENCEATTACK;
 		percentheal -50,0;
 		sc_start Eff_Stone,30000,0;
@@ -1149,7 +1149,7 @@ OnInstanceInit:
 
 2@cata,80,63,4	script	Ancient Hero's Soul#2F	4_M_CHAMPSOUL,{
 	cutin "ins_cata_champ_s",2;
-	if (checkquest(3041)>=0) erasequest 3041;
+	if (questprogress(3041)) erasequest 3041;
 	mes "[Ancient Hero's Soul]";
 	mes "Good job, my descendants... You've finished the long-cherished task that me and my bretheren could not complete.";
 	next;
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index d778d789a..4292e86b8 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -254,7 +254,7 @@ in_moc_16,19,33,1	script	Guildsman#asn	1_M_JOBTESTER,{
 					mes "you to the office.";
 					close2;
 					set ASSIN_Q,0;
-					if (checkquest(8000) != -1) {
+					if (questprogress(8000)) {
 						changequest 8000,8001;
 					} else {
 						setquest 8001;
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index c466925e1..b05c9c897 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -1,4 +1,4 @@
-//===== HerculesScript =======================================
+//===== Hercules Script =======================================
 //= Blacksmith Job Quest
 //===== By: ==================================================
 //= EREMES THE CANIVALIZER(Aegis)
@@ -248,7 +248,7 @@ ein_in01,18,28,4	script	Guildsman#BLS	4_M_JOB_BLACKSMITH,{
 		else if (BSMITH_Q == 17 && countitem(1005) > 0 && JobLevel > 39) {
 			mes "[Altiregen]";
 			mes "Excellent, I can tell by the twinkle in your eye that you were successful. I can now bestow upon you the gift of the smithing, the art of the Blacksmith.";
-			if (checkquest(2015) != -1) {
+			if (questprogress(2015)) {
 				changequest 2015,2016;
 			}
 			next;
@@ -483,7 +483,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	1_M_SMITH,{
 				mes "Let's see...your score is..." + .@black_q + " points.";
 				if (.@black_q == 100) {
 					set BSMITH_Q,3;
-					if (checkquest(2001) != -1) {
+					if (questprogress(2001)) {
 						changequest 2001,2002;
 					} else {
 						changequest 2000,2002;
@@ -500,7 +500,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	1_M_SMITH,{
 					close;
 				}
 				set BSMITH_Q,2;
-				if (checkquest(2001) == -1) {
+				if (!questprogress(2001)) {
 					changequest 2000,2001;
 				}
 				mes ".............";
@@ -653,7 +653,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	1_M_SMITH,{
 				case 9:
 					mes "Okay, now take this to ^8E6B23Baisulist^000000 in Geffen of Rune-Midgarts Kingdom. Simply deliver it and bring me the receipt.";
 					getitem 1610,1; //Arc_Wand
-					if (checkquest(2003) != -1) {
+					if (questprogress(2003)) {
 						changequest 2003,2008;
 					}
 					next;
@@ -678,7 +678,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	1_M_SMITH,{
 				case 10:
 					mes "Okay, now take this to ^8E6B23Wickebine^000000 in Morroc of Rune-Midgarts Kingdom. Simply deliver it and bring me the receipt.";
 					getitem 1219,1; //Gladius
-					if (checkquest(2004) != -1) {
+					if (questprogress(2004)) {
 						changequest 2004,2009;
 					}
 					next;
@@ -703,7 +703,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	1_M_SMITH,{
 				case 11:
 					mes "Okay, now take this to ^8E6B23Krongast^000000 in Lighthalzen. Simply deliver it and bring me the receipt.";
 					getitem 1119,1; //Tsurugi
-					if (checkquest(2005) != -1) {
+					if (questprogress(2005)) {
 						changequest 2005,2010;
 					}
 					next;
@@ -729,7 +729,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	1_M_SMITH,{
 				case 12:
 					mes "Okay, now take this to ^8E6B23Talpiz^000000 in Payon of Rune-Midgarts Kingdom. Simply deliver this and bring me the receipt.";
 					getitem 1713,1; //Arbalest
-					if (checkquest(2006) != -1) {
+					if (questprogress(2006)) {
 						changequest 2006,2011;
 					}
 					next;
@@ -753,7 +753,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	1_M_SMITH,{
 				case 13:
 					mes "Okay, now take this to ^8E6B23Bismarc^000000 in Hugel. Simply deliver this and bring back the receipt.";
 					getitem 1122,1; //Ring_Pommel_Saber
-					if (checkquest(2007) != -1) {
+					if (questprogress(2007)) {
 						changequest 2007,2012;
 					}
 					next;
@@ -850,16 +850,16 @@ ein_in01,201,27,3	script	Guildsman#alberta	1_M_SMITH,{
 				if (countitem(1073) > 0) {
 					set BSMITH_Q,15;
 					delitem 1073,1; //Merchant_Voucher_1
-					if (checkquest(2008) != -1) {
+					if (questprogress(2008)) {
 						changequest 2008,2013;
 					}
-					else if (checkquest(2009) != -1) {
+					else if (questprogress(2009)) {
 						changequest 2009,2013;
 					}
-					else if (checkquest(2010) != -1) {
+					else if (questprogress(2010)) {
 						changequest 2010,2013;
 					}
-					else if (checkquest(2011) != -1) {
+					else if (questprogress(2011)) {
 						changequest 2011,2013;
 					}
 					else {
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index b1f1f518b..ab163860f 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -223,7 +223,7 @@ hu_in01,386,373,4	script	Hunter Guildsman#hnt	4_F_JOB_HUNTER,{
 					mes "shall we begin?";
 					next;
 					if (select("Yes~ Let's start now.:No, I'll be back later.") == 1) {
-						if(checkquest(4000) == -1) {
+						if (!questprogress(4000)) {
 							setquest 4000;
 						}
 						mes "[Hunter Sherin]";
@@ -556,22 +556,22 @@ hu_in01,382,382,4	script	Guild Receptionist#hnt	4_M_JOB_HUNTER,{
 			mes "[Demon Hunter]";
 			mes "You brought all of the necessary materials... You can get directions to the testing area from our Guildmaster who is currently in the Payon Central Palace.";
 			set HNTR_Q,.@items[6];
-			if(checkquest(4002) != -1) {
+			if (questprogress(4002)) {
 				changequest 4002,4009;
 			}
-			else if(checkquest(4003) != -1) {
+			else if (questprogress(4003)) {
 				changequest 4003,4009;
 			}
-			else if(checkquest(4004) != -1) {
+			else if (questprogress(4004)) {
 				changequest 4004,4009;
 			}
-			else if(checkquest(4005) != -1) {
+			else if (questprogress(4005)) {
 				changequest 4005,4009;
 			}
-			else if(checkquest(4006) != -1) {
+			else if (questprogress(4006)) {
 				changequest 4006,4010;
 			}
-			else if(checkquest(4007) != -1) {
+			else if (questprogress(4007)) {
 				changequest 4007,4010;
 			}
 			else {
diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index da1d8a8e4..62fd03aaf 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -1109,7 +1109,7 @@ prt_in,79,94,4	script	Sir Windsor#knt	4_M_JOB_KNIGHT1,{
 			mes "...";
 			next;
 			set KNIGHT_Q,7;
-			if (checkquest(9004) != -1) {
+			if (questprogress(9004)) {
 				changequest 9004,9005;
 			}
 			mes "[Sir Windsor]";
@@ -1126,7 +1126,8 @@ prt_in,79,94,4	script	Sir Windsor#knt	4_M_JOB_KNIGHT1,{
 				mes "...This way.";
 			}
 			close2;
-			if(checkquest(9006) == -1) changequest 9005,9006;
+			if (!questprogress(9006))
+				changequest 9005,9006;
 			warp "job_knt",89,101;
 			end;
 		}
@@ -1416,7 +1417,7 @@ OnMyMobDead:
 		mes "Amy Beatrice now.";
 		close2;
 		set KNIGHT_Q,8;
-		if(checkquest(9007) == -1) {
+		if (!questprogress(9007)) {
 			changequest 9006,9007;
 		}
 		warp "prt_in",80,100;
@@ -1544,7 +1545,8 @@ prt_in,69,107,6	script	Lady Amy#knt	4_F_JOB_KNIGHT,{
 			mes "come to Amy?";
 			next;
 			if (select("Sir Windsor told me to--:Oh, nothing.") == 1) {
-				if(checkquest(9008) == -1) changequest 9007,9008;
+				if (!questprogress(9008))
+					changequest 9007,9008;
 				mes "[Lady Amy]";
 				mes "Oh!";
 				mes "No need to say";
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index 57f6a2647..76fb03cad 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -690,7 +690,7 @@ prt_church,27,24,1	script	Sister Cecilia	1_F_PRIEST,{
 	}
 	else if (PRIEST_Q == 7 || PRIEST_Q == 8) {
 		if (PRIEST_Q == 7) {
-			if(checkquest(8014) == -1) {
+			if (!questprogress(8014)) {
 				changequest 8013,8014;
 			}
 			mes "Welcome! I'm so glad to see you've come back! Now, there is one last trial left for you to complete.";
@@ -990,7 +990,7 @@ job_prist,24,187,4	script	Peter S. Alberto	4_M_MINISTER,{
 			mes "Kill those";
 			mes "misbegotten creatures!";
 			close2;
-			if(checkquest(8012) == -1) {
+			if (!questprogress(8012)) {
 				changequest 8011,8012;
 			}
 			warp "job_prist",24,44;
@@ -1712,7 +1712,7 @@ OnTouch:
 	}
 	else if (BaseClass == Job_Acolyte) {
 		set PRIEST_Q,7;
-		if(checkquest(8012) != -1) {
+		if (questprogress(8012)) {
 			changequest 8012,8013;
 		}
 		warp "prt_church",16,37;
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index b62685c6b..86c245f94 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -547,7 +547,7 @@ gef_tower,102,24,2	script	Gloomy Wizard	4_M_JOB_WIZARD,{
 			mes "[Raulel]";
 			mes "I'll give you 10 questions so give me the right answers.";
 			mes "If you get something wrong, I won't tell you what it is!";
-			if(checkquest(9016) == -1) {
+			if (!questprogress(9016)) {
 				changequest 9015,9016;
 			}
 			next;
diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index 7e5ca7e33..b30defc48 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -234,10 +234,10 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	4_F_ALCHE,{
 			mes "Okay, now you need to learn";
 			mes "the basics to being an Alchemist and learn the procedures for mixing chemicals and medicines.";
 			set ALCH_Q,4;
-			if(checkquest(2028) != -1) {
+			if (questprogress(2028)) {
 				changequest 2028,2031;
 			}
-			else if(checkquest(2029) != -1) {
+			else if (questprogress(2029)) {
 				changequest 2029,2031;
 			}
 			else {
@@ -267,10 +267,10 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	4_F_ALCHE,{
 			mes "Okay, now you need to learn";
 			mes "the basics to being an Alchemist and learn the procedures for mixing chemicals and medicines.";
 			set ALCH_Q,4;
-			if(checkquest(2028) != -1) {
+			if (questprogress(2028)) {
 				changequest 2028,2031;
 			}
-			else if(checkquest(2029) != -1) {
+			else if (questprogress(2029)) {
 				changequest 2029,2031;
 			}
 			else {
@@ -1687,10 +1687,10 @@ alde_alche,101,184,4	script	Master Alchemist#am	2_M_DYEINGER,{
 			cutin "",255;
 			end;
 		}
-		if(checkquest(2039) != -1) {
+		if (questprogress(2039)) {
 			changequest 2039,2040;
 		}
-		if(checkquest(2034) != -1) {
+		if (questprogress(2034)) {
 			changequest 2034,2040;
 		}
 		mes "Ah, well done.";
diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt
index 24d49cbce..55b7401a1 100644
--- a/npc/jobs/2-2/bard.txt
+++ b/npc/jobs/2-2/bard.txt
@@ -433,7 +433,7 @@ comodo,226,123,5	script	Wandering Bard	2_M_BARD_ORIENT,{
 				mes "Then, do you want to try singing...?";
 				mes "I'll sing a short melody...";
 				mes "and you try after.";
-				if(checkquest(3003) == -1) {
+				if (!questprogress(3003)) {
 					changequest 3002,3003;
 				}
 				next;
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index d5bcd70ea..232e6c85e 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -245,10 +245,10 @@ prt_castle,45,169,5	script	Senior Crusader	4_M_CRU_OLD,{
 			delitem .@item3, 10;
 			delitem .@item4, 10;
 			set CRUS_Q, 4;
-			if(checkquest(3006) != -1) {
+			if (questprogress(3006)) {
 				changequest 3006,3009;
 			}
-			else if(checkquest(3007) != -1) {
+			else if (questprogress(3007)) {
 				changequest 3007,3009;
 			}
 			else {
@@ -759,7 +759,7 @@ prt_church,95,127,3	script	Crusader	4_F_CRU,{
 			close;
 		}
 		set CRUS_Q,7;
-		if(checkquest(3011) != -1) {
+		if (questprogress(3011)) {
 			changequest 3011,3012;
 		}
 		mes "Hmmm... What a pity.";
@@ -866,7 +866,7 @@ prt_castle,35,151,5	script	Patron Knight	4_M_CRU,{
 			mes "[Bliant Piyord]";
 			mes "To take the battle test, bring";
 			mes "1 ^3355FFHoly Water^000000. This will be used to purify you prior to taking the test.";
-			if(checkquest(3013) != -1) {
+			if (questprogress(3013)) {
 				changequest 3013,3014;
 			}
 			next;
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index 6b4ddf5b0..a34bf0540 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -320,10 +320,10 @@ job_duncer,43,93,4	script	Aile#da	4_F_07,{
 			mes "[Aile]";
 			mes "Next, go to ^CD6889Bijou^000000, who is in charge of the interviewing process. She will have a couple of things she'll need to ask you.";
 			set DANC_Q,5;
-			if(checkquest(7001) != -1) {
+			if (questprogress(7001)) {
 				changequest 7001,7004;
 			}
-			else if(checkquest(7002) != -1) {
+			else if (questprogress(7002)) {
 				changequest 7002,7004;
 			}
 			else {
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index cf20d5203..d0b2ba95f 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -757,10 +757,10 @@ in_rogue,376,23,1	script	Mr. Smith#rg	1_M_LIBRARYMASTER,{
 			switch(rand(1,3)) {
 			case 1:
 				set ROGUE_Q,9;
-				if(checkquest(2018) != -1) {
+				if (questprogress(2018)) {
 					changequest 2018,2022;
 				}
-				else if(checkquest(2019) != -1) {
+				else if (questprogress(2019)) {
 					changequest 2019,2022;
 				}
 				else {
@@ -794,10 +794,10 @@ in_rogue,376,23,1	script	Mr. Smith#rg	1_M_LIBRARYMASTER,{
 				close;
 			case 2:
 				set ROGUE_Q,10;
-				if(checkquest(2018) != -1) {
+				if (questprogress(2018)) {
 					changequest 2018,2023;
 				}
-				else if(checkquest(2019) != -1) {
+				else if (questprogress(2019)) {
 					changequest 2019,2023;
 				}
 				else {
@@ -830,10 +830,10 @@ in_rogue,376,23,1	script	Mr. Smith#rg	1_M_LIBRARYMASTER,{
 				close;
 			case 3:
 				set ROGUE_Q,11;
-				if(checkquest(2018) != -1) {
+				if (questprogress(2018)) {
 					changequest 2018,2024;
 				}
-				else if(checkquest(2019) != -1) {
+				else if (questprogress(2019)) {
 					changequest 2019,2024;
 				}
 				else {
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index 72bacfaf1..4f0db7888 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -595,13 +595,13 @@ yuno_in03,154,35,4	script	Staff of the Academy#a	2_M_SAGE_B,{
 		mes "Ah yes, everything is in readiness.";
 		mes "Next, you will take an entrance test.";
 		set SAGE_Q,4;
-		if(checkquest(2043) != -1) {
+		if (questprogress(2043)) {
 			changequest 2043,2041;
 		}
-		else if(checkquest(2044) != -1) {
+		else if (questprogress(2044)) {
 			changequest 2044,2041;
 		}
-		else if(checkquest(2045) != -1) {
+		else if (questprogress(2045)) {
 			changequest 2045,2041;
 		}
 		else {
@@ -1881,10 +1881,10 @@ yuno_in03,32,102,1	script	Biology Professor#sa	4_M_SAGE_C,{
 				switch(rand(1,4)) {
 				case 1:
 					set SAGE_Q2,4;
-					if(checkquest(2053) != -1) {
+					if (questprogress(2053)) {
 						changequest 2053,2056;
 					}
-					else if(checkquest(2054) != -1) {
+					else if (questprogress(2054)) {
 						changequest 2054,2056;
 					}
 					else {
@@ -1896,10 +1896,10 @@ yuno_in03,32,102,1	script	Biology Professor#sa	4_M_SAGE_C,{
 					break;
 				case 2:
 					set SAGE_Q2,5;
-					if(checkquest(2053) != -1) {
+					if (questprogress(2053)) {
 						changequest 2053,2057;
 					}
-					else if(checkquest(2054) != -1) {
+					else if (questprogress(2054)) {
 						changequest 2054,2057;
 					}
 					else {
@@ -1911,10 +1911,10 @@ yuno_in03,32,102,1	script	Biology Professor#sa	4_M_SAGE_C,{
 					break;
 				case 3:
 					set SAGE_Q2,6;
-					if(checkquest(2053) != -1) {
+					if (questprogress(2053)) {
 						changequest 2053,2058;
 					}
-					else if(checkquest(2054) != -1) {
+					else if (questprogress(2054)) {
 						changequest 2054,2058;
 					}
 					else {
@@ -1926,10 +1926,10 @@ yuno_in03,32,102,1	script	Biology Professor#sa	4_M_SAGE_C,{
 					break;
 				case 4:
 					set SAGE_Q2,7;
-					if(checkquest(2053) != -1) {
+					if (questprogress(2053)) {
 						changequest 2053,2059;
 					}
-					else if(checkquest(2054) != -1) {
+					else if (questprogress(2054)) {
 						changequest 2054,2059;
 					}
 					else {
@@ -2002,13 +2002,13 @@ yuno_in03,32,102,1	script	Biology Professor#sa	4_M_SAGE_C,{
 				next;
 				set SAGE_Q2,0;
 				set SAGE_Q,12;
-				if(checkquest(2056) != -1) {
+				if (questprogress(2056)) {
 					changequest 2056,2051;
 				}
-				else if(checkquest(2057) != -1) {
+				else if (questprogress(2057)) {
 					changequest 2057,2051;
 				}
-				else if(checkquest(2058) != -1) {
+				else if (questprogress(2058)) {
 					changequest 2058,2051;
 				}
 				else {
diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt
index 49fdcffd4..597407909 100644
--- a/npc/jobs/2-2e/SoulLinker.txt
+++ b/npc/jobs/2-2e/SoulLinker.txt
@@ -520,7 +520,7 @@ job_soul,30,35,6	script	Monk Spirit#link4	4_M_GRANDMONK,{
 		mes "possibly have to do this.";
 		next;
 		set SOUL_Q,4;
-		if(checkquest(6008) == -1) {
+		if (!questprogress(6008)) {
 			changequest 6007,6008;
 		}
 		mes "[Monk Spirit]";
@@ -569,7 +569,7 @@ job_soul,30,25,7	script	Sage Spirit#link5	4_M_SAGE_A,{
 		mes "require your help. I beg you,";
 		mes "let me become your spirit ally.";
 		set SOUL_Q,4;
-		if(checkquest(6008) == -1) {
+		if (!questprogress(6008)) {
 			changequest 6007,6008;
 		}
 		next;
@@ -613,7 +613,7 @@ job_soul,25,30,5	script	Alchemist Spirit#link7	4_F_ALCHE,{
 		mes "on to the next world until I've";
 		mes "passed on my techniques...";
 		set SOUL_Q,4;
-		if(checkquest(6008) == -1) {
+		if (!questprogress(6008)) {
 			changequest 6007,6008;
 		}
 		next;
diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index 0aa4c4e3f..ad6d5f795 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -325,7 +325,7 @@ yuno_in02,93,207,1	script	Book of Ymir	HIDDEN_NPC,{
 			mes "can confirm that Valkyrie and Valhalla actually exist...";
 			next;
 			set valkyrie_Q,2;
-			if(checkquest(1000) == -1) {
+			if(!questprogress(1000)) {
 				setquest 1000;
 			}
 			mes "[The Book of Ymir]";
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;
diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt
index e8cfdb615..5a651c090 100644
--- a/npc/re/cities/malangdo.txt
+++ b/npc/re/cities/malangdo.txt
@@ -19,7 +19,7 @@
 // Malangdo Transportation :: malangdo_go
 //============================================================
 -	script	Dolangmal	-1,{
-	if (checkquest(5091) == -1) {
+	if (!questprogress(5091)) {
 		mes "[Dolangmal]";
 		mes "Hey~! Hi human~ This is Mr. Dolangmal. kakaka~";
 		next;
diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt
index da19e67c5..54064d8a5 100644
--- a/npc/re/cities/malaya.txt
+++ b/npc/re/cities/malaya.txt
@@ -222,7 +222,7 @@ OnTouch:
 		if (getcharid(0) == getpartyleader(getcharid(1),2))
 			set .@pass,1;
 	} else if (.@i%4 == 3) {
-		if (checkquest(4229,PLAYTIME) > -1 && checkquest(9223,PLAYTIME) > -1 && checkquest(12278,PLAYTIME) > -1)
+		if (questprogress(4229,PLAYTIME) && questprogress(9223,PLAYTIME) && questprogress(12278,PLAYTIME))
 			set .@pass,1;
 	} else if (.@i%4 == 0) {
 		if (rand(1,100)%10 == 7)