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

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

8 files changed, 72 insertions, 74 deletions

diff --git a/npc/re/instances/BakonawaLake.txt b/npc/re/instances/BakonawaLake.txt
index 89ce64ac4..584044b13 100644
--- a/npc/re/instances/BakonawaLake.txt
+++ b/npc/re/instances/BakonawaLake.txt
@@ -39,16 +39,16 @@ ma_scene01,174,179,4	script	Taho	4_M_DEWZATIMAN,{
 	set .@party_id,getcharid(1);
 	set .@md_name$, "Bakonawa Lake";
 
-	set .@baku_time, checkquest(12278,PLAYTIME);
-	if (.@baku_time == -1) {
-		if (checkquest(12279) == -1) setquest 12279;
+	.@baku_time = questprogress(12278,PLAYTIME);
+	if (!.@baku_time) {
+		if (!questprogress(12279)) setquest 12279;
 	}
 	if (!.@party_id) {
 		mes "[Taho]";
 		mes "Isn't there any company who can go with you? Or even if you wanna go alone, come after organizing a party.";
 		close;
 	}
-	if (.@baku_time == -1) {
+	if (!.@baku_time) {
 		if (getcharid(0) == getpartyleader(.@party_id,2)) {
 			mes "[Taho]";
 			mes "Are you the leader of the Bakonawa slayers? The road is not well so we have to go down the cliff with a rope, is that OK?";
@@ -92,7 +92,7 @@ ma_scene01,174,179,4	script	Taho	4_M_DEWZATIMAN,{
 		case 3:
 			close;
 		}
-	} else if (.@baku_time == 0 || .@baku_time == 1) {
+	} else if (.@baku_time == 1) {
 		mes "[Taho]";
 		mes "The rope used for getting to the Lake is already broken. We are now cleaning up the surroundings so come back after some time.";
 		close;
@@ -469,7 +469,7 @@ OnMobSpawn:
 		mes "It seems you are already carrying items of too much weight. Please try again after reducing the weight.";
 		close;
               }
-	if (checkquest(12279,HUNTING) == 2) {
+	if (questprogress(12279,HUNTING) == 2) {
 		erasequest 12279;
 		mes "[Taho]";
 		mes "This was found from Bakonawa's corpse. It would be better if you take this.";
diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt
index b995092a1..d4ac3f9b0 100644
--- a/npc/re/instances/BangungotHospital.txt
+++ b/npc/re/instances/BangungotHospital.txt
@@ -23,9 +23,9 @@ ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
 
 	set .@party_id,getcharid(1);
 	cutin "malaya_nurseB",2;
-	if (checkquest(9223) == -1) {
-		set .@quest, checkquest(9222);
-		if (.@quest == -1) {
+	if (!questprogress(9223)) {
+		.@quest = questprogress(9222);
+		if (!.@quest) {
 			if (!.@party_id) {
 				if (malaya_bang == 30)
 					callsub L_Closed,1;
@@ -34,9 +34,9 @@ ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
 				else
 					goto L_NoParty;
 			}
-			if (checkquest(11309,HUNTING) < 2) {
-				set .@playtime, checkquest(9224,PLAYTIME);
-				if (.@playtime == -1) {
+			if (questprogress(11309,HUNTING) != 2) {
+				.@playtime = questprogress(9224,PLAYTIME);
+				if (!.@playtime) {
 					if (malaya_bang == 30)
 						callsub L_Closed,1;
 					else if (malaya_bang == 31)
@@ -50,8 +50,8 @@ ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
 						cutin "",255;
 						end;
 					}
-				} else if (.@playtime == 0 || .@playtime == 1) {
-					if (checkquest(11309) == -1) {
+				} else if (.@playtime == 1) {
+					if (!questprogress(11309)) {
 						mes "[Nurse Maenne]";
 						mes "This is a fatal situation.";
 						close2;
@@ -73,10 +73,10 @@ ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
 						end;
 					}
 				} else {
-					set .@quest2, checkquest(11309);
-					if (.@quest2 == -1) {
+					.@quest2 = questprogress(11309);
+					if (!.@quest2) {
 						callsub L_Closed,0;
-					} else if (.@quest2 == 0 || .@quest2 == 1) {
+					} else if (.@quest2 == 1) {
 						callsub L_Complete;
 						completequest 9224;
 						erasequest 9224;
@@ -105,13 +105,12 @@ ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
 				cutin "",255;
 				end;
 			}
-		} else if (.@quest == 0 || .@quest == 1) {
+		} else if (.@quest == 1) {
 			if (!.@party_id) goto L_NoParty;
 			if (malaya_bang > 39) {
-				set .@hunting, checkquest(9222,HUNTING);
-				if (.@hunting == 0 || .@hunting == 1) {
-					set .@playtime, checkquest(9224,PLAYTIME);
-					if (.@playtime == 0 || .@playtime == 1) {
+				if (questprogress(9222,HUNTING) == 1) {
+					.@playtime = questprogress(9224,PLAYTIME);
+					if (.@playtime == 1) {
 						mes "[Nurse Maenne]";
 						mes "Do you want go up to the second floor again?";
 						next;
@@ -190,7 +189,7 @@ ma_dun01,147,10,5	script	Nurse#ma_dun01	4_F_NURSE,{
 			end;
 		}
 	} else {
-		if (checkquest(9223,PLAYTIME) == 0 || checkquest(9223,PLAYTIME) == 1) {
+		if (questprogress(9223,PLAYTIME) == 1) {
 			callsub L_Complete;
 			close2;
 			cutin "",255;
@@ -297,13 +296,13 @@ L_Enter:
 		} else {
 			mapannounce "ma_dun01", getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member entered "+.@md_name$+".",bc_map,"0x00ff99";
 			if (getarg(1)) {
-				if (checkquest(9223) > -1) {
+				if (questprogress(9223)) {
 					completequest 9223;
 					erasequest 9223;
 				}
-				if (checkquest(9222) > -1)
+				if (questprogress(9222))
 					erasequest 9222;
-				if (checkquest(9224) > -1)
+				if (questprogress(9224))
 					erasequest 9224;
 				setquest 9222;
 			}
diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt
index 0a26dab9c..a24a0ae27 100644
--- a/npc/re/instances/BuwayaCave.txt
+++ b/npc/re/instances/BuwayaCave.txt
@@ -60,10 +60,10 @@ ma_fild02,312,317,5	script	Guard#buwaya_cave	4_MAL_SOLDIER,{
 				next;
 				break;
 			case 2:
-				set .@playtime, checkquest(4229,PLAYTIME);
-				if (.@playtime == -1) {
+				.@playtime = questprogress(4229,PLAYTIME);
+				if (!.@playtime) {
 					// fall through
-				} else if (.@playtime == 0 || .@playtime == 1) {
+				} else if (.@playtime == 1) {
 					mes "[Guard]";
 					mes "Buwaya is still hiding.";
 					mes "Even if you enter now, Buwaya will not come out. ";
@@ -118,10 +118,10 @@ OnTouch:
 		mes "This place is dangerous. Please go back.";
 		close;
 	}
-	set .@playtime, checkquest(4229,PLAYTIME);
-	if (.@playtime == -1) {
+	.@playtime = questprogress(4229,PLAYTIME);
+	if (!.@playtime) {
 		// fall through
-	} else if (.@playtime == 0 || .@playtime == 1) {
+	} else if (.@playtime == 1) {
 		mes "[Guard]";
 		mes "Buwaya is still hiding.";
 		mes "Even if you enter now, Buwaya will not come out.";
diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt
index 0c32c73c6..0467f612b 100644
--- a/npc/re/instances/HazyForest.txt
+++ b/npc/re/instances/HazyForest.txt
@@ -32,9 +32,9 @@ bif_fild01,158,340,5	script	Laphine Soldier#mist	4_M_FAIRYSOLDIER,{
 		mes "Why don't you at least organize a party?";
 		close;
 	}
-	set .@playtime, checkquest(7211,PLAYTIME);
+	.@playtime = questprogress(7211,PLAYTIME);
 	if (getcharid(0) == getpartyleader(.@party_id,2)) {
-		if (.@playtime == 0 || .@playtime == 1) {
+		if (.@playtime == 1) {
 			mes "[Laphine Soldier]";
 			mes "...Are you sure you're not doing too much?";
 			mes "I think you'd better get some rest.";
@@ -89,7 +89,7 @@ bif_fild01,158,340,5	script	Laphine Soldier#mist	4_M_FAIRYSOLDIER,{
 				mes "Hmm...";
 				next;
 				mes "[Laphine Soldier]";
-				if (.@playtime == -1)
+				if (!.@playtime)
 					mes "It's dangerous in the forest.";
 				else
 					mes "The atmosphere is somewhat tense in the forest.";
@@ -117,7 +117,7 @@ bif_fild01,158,340,5	script	Laphine Soldier#mist	4_M_FAIRYSOLDIER,{
 		case 2:
 			mes "[Laphine Soldier]";
 			mes "Well, you've made the right decision.";
-			if (.@playtime == -1)
+			if (!.@playtime)
 				mes "That's what's good for you.";
 			close;
 		}
@@ -147,9 +147,8 @@ bif_fild01,161,355,0	script	Log Tunnel	CLEAR_NPC,{
 	next;
 	if(select("Enter the tunnel.:Give up.") == 2)
 		close;
-	set .@playtime, checkquest(7211,PLAYTIME);
 	if (has_instance("1@mist") == "") {
-		if (.@playtime == 0 || .@playtime == 1) {
+		if (questprogress(7211,PLAYTIME) == 1) {
 			mes "You try to crawl into the log, but some mysterious power pushes you back with a gush of wind.";
 			mes "It seems like you can't force your way into the forest.";
 			close;
@@ -158,8 +157,8 @@ bif_fild01,161,355,0	script	Log Tunnel	CLEAR_NPC,{
 		mes "Your instinct is screaming that this forest is dangerous.";
 		close;
 	} else {
-		if (checkquest(7211,PLAYTIME) == 2) erasequest 7211;
-		if (checkquest(7211,PLAYTIME) == -1) setquest 7211;
+		if (questprogress(7211,PLAYTIME) == 2) erasequest 7211;
+		if (!questprogress(7211,PLAYTIME)) setquest 7211;
 		mapannounce "bif_fild01",getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member is entering the Mistwood Maze.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0
 		warp "1@mist",89,29;
 		close;
@@ -1025,7 +1024,7 @@ bif_fild01,38,374,0	script	Mysterious Flower#ep14_1	CLEAR_NPC,{
 1@mist,109,70,0	script	a1_a2	WARPNPC,1,1,{
 	end;
 OnTouch:
-	if (checkquest(7211,PLAYTIME) == -1)
+	if (!questprogress(7211,PLAYTIME))
 		setquest 7211;
 	warp instance_mapname("1@mist"),116,40;
 	end;
diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt
index f209f409b..ef2af8512 100644
--- a/npc/re/instances/MalangdoCulvert.txt
+++ b/npc/re/instances/MalangdoCulvert.txt
@@ -44,7 +44,7 @@ mal_in01,172,28,2	script	Albo#mal	4_CAT_SAILOR5,{
 		"General Culvert Weekly Service","^990000Hard Culvert Weekly Service^000000";
 	set .@menu$,"Why are doing this job?:";
 	for(set .@i,0; .@i<4; set .@i,.@i+1) {
-		if (checkquest(.@quests[.@i],PLAYTIME) > -1) {
+		if (questprogress(.@quests[.@i],PLAYTIME)) {
 			set .@status[.@i],2;
 			set .@menu$, .@menu$+"^aaaaaa- There is no new task -^000000:";
 		} else if (.@i%2 && BaseLevel < 140) {
@@ -192,7 +192,7 @@ mal_in01,172,26,2	script	Madeca#mal	4_CAT_SAILOR1,{
 	specialeffect2 EF_STEAL;
 	switch(.@i) {
 	case 1: // General Culvert Daily Service
-		if (checkquest(12271,PLAYTIME) == 2)
+		if (questprogress(12271,PLAYTIME) == 2)
 			callsub L_EraseQuest,12255,12256,12257,12258,12259,12260,12271;
 		else {
 			// Reward: 2x B Grade Coin
@@ -205,7 +205,7 @@ mal_in01,172,26,2	script	Madeca#mal	4_CAT_SAILOR1,{
 		}
 		break;
 	case 2: // Hard Culvert Daily Service
-		if (checkquest(12272,PLAYTIME) == 2)
+		if (questprogress(12272,PLAYTIME) == 2)
 			callsub L_EraseQuest,12261,12262,12263,12264,12265,12266,12272;
 		else {
 			// Reward: 1x A Grade Coin
@@ -218,7 +218,7 @@ mal_in01,172,26,2	script	Madeca#mal	4_CAT_SAILOR1,{
 		}
 		break;
 	case 3: // General Culvert Weekly Service
-		if (checkquest(12273,PLAYTIME) == 2)
+		if (questprogress(12273,PLAYTIME) == 2)
 			callsub L_EraseQuest,12267,12268,12273;
 		else {
 			// Reward: 1x Sea God's Wrath
@@ -227,7 +227,7 @@ mal_in01,172,26,2	script	Madeca#mal	4_CAT_SAILOR1,{
 		}
 		break;
 	case 4: // Hard Culvert Weekly Service
-		if (checkquest(12274,PLAYTIME) == 2)
+		if (questprogress(12274,PLAYTIME) == 2)
 			callsub L_EraseQuest,12269,12270,12274;
 		else {
 			// Reward: 5x Sea God's Wrath
@@ -246,7 +246,7 @@ mal_in01,172,26,2	script	Madeca#mal	4_CAT_SAILOR1,{
 
 L_EraseQuest:
 	for(set .@j,0; .@j<getargcount(); set .@j,.@j+1) {
-		if (checkquest(getarg(.@j)) > -1)
+		if (questprogress(getarg(.@j)))
 			erasequest getarg(.@j);
 	}
 	mes "[Madeca]";
@@ -255,7 +255,7 @@ L_EraseQuest:
 
 // callsub L_CheckQuest,<quest ID>,<monster>,<reward item ID>,<reward item amount>;
 L_CheckQuest:
-	if (checkquest(getarg(0),HUNTING) == 2) {
+	if (questprogress(getarg(0),HUNTING) == 2) {
 		mes "[Madeca]";
 		mes "You've punished ^0000ff"+getarg(1)+"^000000!";
 		mes "Here's your pay!";
@@ -392,8 +392,8 @@ mal_in01,160,34,4	script	Missing, the Cleaner	4_CAT_SAILOR2,{
 		mes "of the party and come back.^000000";
 		close;
 	}
-	set .@playtime, checkquest(12254,PLAYTIME);
-	if (.@playtime == -1) {
+	.@playtime = questprogress(12254,PLAYTIME);
+	if (!.@playtime) {
 		if (getcharid(0) == getpartyleader(.@party_id,2)) {
 			mes "[Missing, the Cleaner]";
 			mes "Ummm? What's up? Tell me the password if you're the leader!";
@@ -430,7 +430,7 @@ mal_in01,160,34,4	script	Missing, the Cleaner	4_CAT_SAILOR2,{
 		if(select("Enter Culvert:Cancel") == 2)
 			end;
 		callsub L_Enter,1;
-	} else if (.@playtime == 0 || .@playtime == 1) {
+	} else if (.@playtime == 1) {
 		mes "You can enter the Culvert if the gate is open.";
 		next;
 		if(select("Enter Culvert:Cancel") == 2)
@@ -444,7 +444,7 @@ mal_in01,160,34,4	script	Missing, the Cleaner	4_CAT_SAILOR2,{
 	end;
 L_Enter:
 	if (has_instance("1@pump") == "") {
-		if (checkquest(12254,PLAYTIME) == 0 || checkquest(12254,PLAYTIME) == 1) {
+		if (questprogress(12254,PLAYTIME) == 1) {
 			mes "The gate to the Culvert is still closed.";
 			mes "You must wait until you are able to enter or find a party leader who can create the instance.";
 			close;
@@ -454,7 +454,7 @@ L_Enter:
 		close;
 	}
 	mapannounce "mal_in01", strcharinfo(0)+" of the party "+getpartyname(.@party_id)+" is entering the Culvert.",bc_map,"0x00ff99";
-	if (checkquest(12254) == -1) setquest 12254;
+	if (!questprogress(12254)) setquest 12254;
 	warp "1@pump",63,98;
 	end;
 }
diff --git a/npc/re/instances/OctopusCave.txt b/npc/re/instances/OctopusCave.txt
index 43c2ac66f..cbf45e5f1 100644
--- a/npc/re/instances/OctopusCave.txt
+++ b/npc/re/instances/OctopusCave.txt
@@ -76,8 +76,8 @@ mal_dun01,151,235,5	script	Starfish	4_ASTER,{
 			next;
 			break;
 		case 2:
-			set .@playtime, checkquest(4197,PLAYTIME);
-			if (.@playtime == 0 || .@playtime == 1) {
+			.@playtime = questprogress(4197,PLAYTIME);
+			if (.@playtime == 1) {
 				mes "[Starfish]";
 				mes "Octopus is not around now, hehe.";
 				mes "Please come back later.";
@@ -130,7 +130,7 @@ mal_dun01,153,237,5	script	Weird Entrance	CLEAR_NPC,{
 	case 1:
 		if (countitem(6442)) {
 			if (has_instance("1@cash") == "") {
-				if (checkquest(4197,PLAYTIME) == 0 || checkquest(4197,PLAYTIME) == 1) {
+				if (questprogress(4197,PLAYTIME) == 1) {
 					mes "[Starfish]";
 					mes "Ah, now is not the time...";
 					mes "Would you come back later? Hehe.";
@@ -143,7 +143,7 @@ mal_dun01,153,237,5	script	Weird Entrance	CLEAR_NPC,{
 				close;
 			}
 			mapannounce "mal_dun01", getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member started to hunt the Octopus!",bc_map,"0x00ff99";
-			if (checkquest(4197) == -1) setquest 4197;
+			if (!questprogress(4197)) setquest 4197;
 			warp "1@cash",199,99;
 			end;
 		}
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index 4be3133bc..48f2d6493 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -20,8 +20,8 @@ glast_01,204,273,6	script	Hugin#ghinstance	4_M_SAGE_C,{
 	mes "[Hugin]";
 	mes "Huh? You feel like you have seen me in different places? I see. What can I say?";
 	next;
-	set .@ghins_time, checkquest(12317,PLAYTIME);
-	if (.@ghins_time == -1) {
+	.@ghins_time = questprogress(12317,PLAYTIME);
+	if (!.@ghins_time) {
 
 		set .@party_id,getcharid(1);
 		set .@p_name$,getpartyname(.@party_id);
@@ -72,7 +72,7 @@ glast_01,204,273,6	script	Hugin#ghinstance	4_M_SAGE_C,{
 		case 3:
 			close;
 		}
-	} else if (.@ghins_time == 0 || .@ghins_time == 1) {
+	} else if (.@ghins_time == 1) {
 		mes "[Hugin]";
 		mes "Oh, geez.";
 		mes "Your body is still under the effects of time travel. In this state, you will not be able to travel again.";
@@ -83,8 +83,8 @@ glast_01,204,273,6	script	Hugin#ghinstance	4_M_SAGE_C,{
 	} else {
 		mes "^0000ffOld Glast Heim access trail has been cleared. It is now possible to talk to Hugin.^000000";
 		erasequest 12317;
-		if (checkquest(12318) > -1) erasequest 12318;
-		if (checkquest(12319) > -1) erasequest 12319;
+		if (questprogress(12318)) erasequest 12318;
+		if (questprogress(12319)) erasequest 12319;
 		close;
 	}
 }
@@ -1259,8 +1259,8 @@ OnTalk6:
 }
 
 1@gl_k,156,259,3	script	Varmunt#ghinstance3	4_M_BARMUND,{
-	if (checkquest(12318,HUNTING) == 2) {
-		if (checkquest(12319,HUNTING) == -1) {
+	if (questprogress(12318,HUNTING) == 2) {
+		if (!questprogress(12319,HUNTING)) {
 			mes "[Varmunt]";
 			mes "There's something unusual about this thing's aura. Maybe someday we will be able to understand what is behind all of this.";
 			cutin "gl_barmund1",2;
@@ -1998,7 +1998,7 @@ OnTimer80000:
 }
 
 2@gl_k,158,241,1	script	Hugin#ghinstance1	4_M_SAGE_C,{
-	if (checkquest(12319,HUNTING) == 2) {
+	if (questprogress(12319,HUNTING) == 2) {
 		mes "[Hugin]";
 		mes "Well, you are pretty ridiculous. Beginners shouldn't get the loot Amdarias drops.";
 		erasequest 12318;
diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt
index dc625dca1..dcf726ed3 100644
--- a/npc/re/instances/WolfchevLaboratory.txt
+++ b/npc/re/instances/WolfchevLaboratory.txt
@@ -1690,10 +1690,9 @@ lhz_dun04,151,276,3	script	Researcher#memo	4_LGTSCIENCE,{
 		mes "^FF0000You cannot continue the process due to possessing too many belongings.^000000";
 		close;
 	}
-	.@quest_time = checkquest(5112, PLAYTIME);
 	.@killed_bosses = true;
 	for(.@quest_id = 5113; .@quest_id <= 5125; .@quest_id++) {
-		if(checkquest(.@quest_id, HUNTING) <= 1)
+		if(questprogress(.@quest_id, HUNTING) != 2)
 			.@killed_bosses = false;
 	}
 	if (lght_duk01 < 6) {
@@ -1780,14 +1779,15 @@ lhz_dun04,151,276,3	script	Researcher#memo	4_LGTSCIENCE,{
 				mes "And just so you know, please do not touch random things out of curiosity. I don't want you to get hurt.";
 				close;
 			case 2:
-				if (.@quest_time == 0) {
+				.@quest_time = questprogress(5112, PLAYTIME);
+				if (!.@quest_time) {
 					mes "[Wolfchev]";
 					mes "I'm sorry, but it seems you still cannot enter to the laboratory yet. Will you come back later? The system is kind of tricky you know.";
 					close;
 				} else {
 					//if (.@quest_time == 2)
 						//recall_completequest 5112;
-					if (.@quest_time >= 0)
+					if (.@quest_time)
 						erasequest 5112;
 					if (!.@killed_bosses) {
 						if (lght_duk01 == 9) {
@@ -1908,13 +1908,13 @@ lhz_dun04,147,279,0	script	Laboratory Entrance#memo	CLEAR_NPC,{
 		mes "^FF0000You cannot continue the process due to possessing too many belongings.^000000";
 		close;
 	}
-	.@lhz_time = checkquest(5112, PLAYTIME);
+	.@lhz_time = questprogress(5112, PLAYTIME);
 	if (lght_duk01 < 7) {
 		mes "It says,";
 		mes "'^0000FF****'s laboratory member only^000000'";
 		close;
 	}
-	if (.@lhz_time == -1) {
+	if (!.@lhz_time) {
 		mes "This is an entrance towards Wolfchev's laboratory. Something is howling over the entrance.";
 		next;
 		if(select("Go inside", "Think one more time") == 2) {
@@ -1938,7 +1938,7 @@ lhz_dun04,147,279,0	script	Laboratory Entrance#memo	CLEAR_NPC,{
 			warp "1@lhz.gat", 45, 148;
 			close;
 		}
-	} else if (.@lhz_time == 0) {
+	} else if (.@lhz_time == 1) {
 		mes "Di Rit- Di- Di- Dit-";
 		next;
 		mes ""+ strcharinfo(PC_NAME) +". . .";
@@ -1946,7 +1946,7 @@ lhz_dun04,147,279,0	script	Laboratory Entrance#memo	CLEAR_NPC,{
 		next;
 		mes "The system denied your entrance.";
 		close;
-	} else if (.@lhz_time >= 1) {
+	} else if (.@lhz_time == 2) {
 		mes "Di Rit- Di- Di- Dit-";
 		next;
 		//if (.@lhz_time == 2)
@@ -3113,7 +3113,7 @@ lhz_dun04,147,279,0	script	Laboratory Entrance#memo	CLEAR_NPC,{
 	}
 	.@all_quests_complete = true;
 	for(.@i = 5113; .@i <= 5125; .@i++) {
-		if(checkquest(.@i, HUNTING) != 2)
+		if(questprogress(.@i, HUNTING) != 2)
 			.@all_quests_complete = false;
 	}
 	if (.@all_quests_complete) {