From bd86d05a59e9680ff8c645854a546617a9caaf2e Mon Sep 17 00:00:00 2001 From: Haru Date: Tue, 20 May 2014 11:43:59 +0200 Subject: Corrected Bioethics quest checks in the Biochemist NPC - As of 4ea6d474 (almost 7 years ago!) the correct check is bioeth==13, rather than MISC_QUEST&64. Special thanks to ossi0110. - Minor tweaks to the script to match Hercules standards. Signed-off-by: Haru --- npc/jobs/2-2a/Creator.txt | 111 ++++++++++++++++++++++------------------------ 1 file changed, 53 insertions(+), 58 deletions(-) diff --git a/npc/jobs/2-2a/Creator.txt b/npc/jobs/2-2a/Creator.txt index a8a81f0c9..59f7e17e2 100644 --- a/npc/jobs/2-2a/Creator.txt +++ b/npc/jobs/2-2a/Creator.txt @@ -4,19 +4,19 @@ //= Nana //= finished, optimized and tested by Lupus //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Description: ========================================= //= Advance Class jobchanger after kRO Normals. //===== Additional Comments: ================================= //= 1.1 Made all into functions, additional checks, etc. [Lupus] //= 1.2 Made numbers into constants. [Vicious] //= 1.3 Now saves/restores all the quest skills [Lupus] +//= 1.4 Corrected check for the Bioethics quest variable [Haru] //============================================================ valkyrie,53,50,3 script Biochemist#Valkyrie 2_M_DYEINGER,{ if (ADVJOB == 0 || Upper != 1) { - set .@karma_d,rand(1,10); - if (.@karma_d > 4) { + if (rand(1,10) > 4) { mes "[Biochemist]"; mes "Congratulations."; mes "Honor to the warriors!"; @@ -37,8 +37,7 @@ valkyrie,53,50,3 script Biochemist#Valkyrie 2_M_DYEINGER,{ mes "fought that earned me"; mes "a place in Valhalla..."; close; - } - else if (ADVJOB == Job_Creator && Class == Job_Merchant_High && JobLevel > 39) { + } else if (ADVJOB == Job_Creator && Class == Job_Merchant_High && JobLevel > 39) { mes "[Biochemist]"; mes "Yes..."; mes "It's about time."; @@ -63,7 +62,7 @@ valkyrie,53,50,3 script Biochemist#Valkyrie 2_M_DYEINGER,{ close; } jobchange Job_Creator; - set ADVJOB,0; + ADVJOB = 0; mes "[Biochemist]"; mes "Congratulations!"; mes "As a Biochemist,"; @@ -71,64 +70,60 @@ valkyrie,53,50,3 script Biochemist#Valkyrie 2_M_DYEINGER,{ mes "vast knowledge for the"; mes "right purposes."; close; - } - else { - if (Class == Job_Creator && MISC_QUEST & 64 && getskilllv("AM_BIOETHICS") == 0) { + } else if (Class == Job_Creator && bioeth == 13 && getskilllv(AM_BIOETHICS) == 0) { + mes "[Biochemist]"; + mes "Ah, have you come to"; + mes "retrieve the memories"; + mes "lost to you? Yes, you"; + mes "must be here for the"; + mes "secrets of life that"; + mes "were once yours..."; + next; + if (select("Yes:No") == 1) { mes "[Biochemist]"; - mes "Ah, have you come to"; - mes "retrieve the memories"; - mes "lost to you? Yes, you"; - mes "must be here for the"; - mes "secrets of life that"; - mes "were once yours..."; + mes "Close your eyes and"; + mes "put your mind at rest."; + mes "We will return to your"; + mes "past to recollect the"; + mes "fragments of your lost"; + mes "memories."; next; - if (select("Yes:No") == 1) { - mes "[Biochemist]"; - mes "Close your eyes and"; - mes "put your mind at rest."; - mes "We will return to your"; - mes "past to recollect the"; - mes "fragments of your lost"; - mes "memories."; - next; - mes "[Biochemist]"; - mes "When you open your eyes,"; - mes "you will clearly remember"; - mes "the secret of life. You will"; - mes "also remember the weight of"; - mes "responsibility in using these"; - mes "secrets for the right ends..."; - next; - skill 238,1,0; - mes "[Biochemist]"; - mes "Open your eyes..."; - mes "Now that you have"; - mes "remembered how to"; - mes "create artificial life, I only"; - mes "ask that you treat all of your"; - mes "creations with respect."; - close; - } mes "[Biochemist]"; - mes "If you wish to"; - mes "retrieve your lost"; - mes "memories, please"; - mes "come back to me."; - mes "The secret to creating"; - mes "life is no trifling thing..."; + mes "When you open your eyes,"; + mes "you will clearly remember"; + mes "the secret of life. You will"; + mes "also remember the weight of"; + mes "responsibility in using these"; + mes "secrets for the right ends..."; + next; + skill AM_BIOETHICS,1,0; + mes "[Biochemist]"; + mes "Open your eyes..."; + mes "Now that you have"; + mes "remembered how to"; + mes "create artificial life, I only"; + mes "ask that you treat all of your"; + mes "creations with respect."; close; } mes "[Biochemist]"; - mes "Welcome"; - mes "to Valhalla,"; - mes "the Hall of Honor."; - next; - mes "[Biochemist]"; - mes "Please make"; - mes "yourself comfortable"; - mes "while you are here."; - mes "Honor to the warriors!"; + mes "If you wish to"; + mes "retrieve your lost"; + mes "memories, please"; + mes "come back to me."; + mes "The secret to creating"; + mes "life is no trifling thing..."; close; } + mes "[Biochemist]"; + mes "Welcome"; + mes "to Valhalla,"; + mes "the Hall of Honor."; + next; + mes "[Biochemist]"; + mes "Please make"; + mes "yourself comfortable"; + mes "while you are here."; + mes "Honor to the warriors!"; + close; } - -- cgit v1.2.3-60-g2f50