From b7a88442cefed36b81f80139310061fed10527e1 Mon Sep 17 00:00:00 2001
From: masao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 4 Aug 2012 21:45:50 +0000
Subject: - Here comes the big Job folder Update. * Updated all 1-1, 2-1, 2-2
 and the expanded files to the latest available official files and also added
 support for baby job change. * There might be some optimizations still needed
 at some places and there maybe occur some errors as well or the job change
 isn't fully working anymore since I didn't test all the jobs through the end
 (Me = Lazy), if so then please fill out a bug report in our bug tracker:
 http://rathena.org/board/tracker/project-4-scripts/ * Ninja, Gunslinger and
 the other files will follow within the next days.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16579 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/jobs/2-2a/Creator.txt | 107 ++++++++++++++++++++++------------------------
 1 file changed, 52 insertions(+), 55 deletions(-)

(limited to 'npc/jobs/2-2a/Creator.txt')

diff --git a/npc/jobs/2-2a/Creator.txt b/npc/jobs/2-2a/Creator.txt
index 3b85907e9..1353c8ab7 100644
--- a/npc/jobs/2-2a/Creator.txt
+++ b/npc/jobs/2-2a/Creator.txt
@@ -16,7 +16,7 @@
 //============================================================ 
 
 valkyrie,53,50,3	script	Biochemist#Valkyrie	122,{
-	if (ADVJOB == 0 || Upper != 1) {
+	if (FJOB == 0 || Upper != 1) {
 		set .@karma_d,rand(1,10);
 		if (.@karma_d > 4) {
 			mes "[Biochemist]";
@@ -40,7 +40,7 @@ valkyrie,53,50,3	script	Biochemist#Valkyrie	122,{
 		mes "a place in Valhalla...";
 		close;
 	}
-	else if (ADVJOB == Job_Creator && Class == Job_Merchant_High && JobLevel > 39) {
+	if ((FJOB == Job_Genetic) && (Class == Job_Merchant_High) && (JobLevel > 39)) {
 		mes "[Biochemist]";
 		mes "Yes...";
 		mes "It's about time.";
@@ -65,7 +65,7 @@ valkyrie,53,50,3	script	Biochemist#Valkyrie	122,{
 			close;
 		}
 		jobchange Job_Creator;
-		set ADVJOB,0;
+		set FJOB,0;
 		mes "[Biochemist]";
 		mes "Congratulations!";
 		mes "As a Biochemist,";
@@ -74,63 +74,60 @@ valkyrie,53,50,3	script	Biochemist#Valkyrie	122,{
 		mes "right purposes.";
 		close;
 	}
-	else {
-		if (Class == Job_Creator && MISC_QUEST & 64 && getskilllv("AM_BIOETHICS") == 0) {
+	if ((Class == Job_Creator) && (MISC_QUEST & 64) && (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 "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 "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 "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;
-			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;
-			}
+			skill 238,1,0;
 			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 "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;
+}
\ No newline at end of file
-- 
cgit v1.2.3-60-g2f50