* Raw revert of all job files back to r16578, prior to the rewrite in r16579. The updates will be re-applied after more testing is done.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16621 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 53 insertions, 50 deletions

diff --git a/npc/jobs/2-2a/Creator.txt b/npc/jobs/2-2a/Creator.txt
index 6f9b2ed2d..3b85907e9 100644
--- a/npc/jobs/2-2a/Creator.txt
+++ b/npc/jobs/2-2a/Creator.txt
@@ -40,7 +40,7 @@ valkyrie,53,50,3	script	Biochemist#Valkyrie	122,{
 		mes "a place in Valhalla...";
 		close;
 	}
-	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.";
@@ -74,60 +74,63 @@ valkyrie,53,50,3	script	Biochemist#Valkyrie	122,{
 		mes "right purposes.";
 		close;
 	}
-	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;
+	else {
+		if (Class == Job_Creator && MISC_QUEST & 64 && getskilllv("AM_BIOETHICS") == 0) {
 			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...";
+			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;
-			skill 238,1,0;
+			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 "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.";
+			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 "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 "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;
 	}
-	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
+}
+