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

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

14 files changed, 68 insertions, 66 deletions

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