From 32169c383f2658192b6b8cb02d7f818a361dda03 Mon Sep 17 00:00:00 2001 From: Haru Date: Mon, 20 Oct 2014 04:20:29 +0200 Subject: Removed use of 'checkquest' from scripts (common folder) Signed-off-by: Haru --- npc/jobs/2-1/assassin.txt | 2 +- npc/jobs/2-1/blacksmith.txt | 26 +++++++++++++------------- npc/jobs/2-1/hunter.txt | 14 +++++++------- npc/jobs/2-1/knight.txt | 10 ++++++---- npc/jobs/2-1/priest.txt | 6 +++--- npc/jobs/2-1/wizard.txt | 2 +- 6 files changed, 31 insertions(+), 29 deletions(-) (limited to 'npc/jobs/2-1') 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; -- cgit v1.2.3-60-g2f50