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

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

4 files changed, 96 insertions, 106 deletions

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]";