- Added Baby job change support for the remaining 2-2 job change quests. bugreport:5789

- Fixed bugreport:6371

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

1 files changed, 1343 insertions, 651 deletions

diff --git a/npc/re/jobs/2-2/alchemist.txt b/npc/re/jobs/2-2/alchemist.txt
index fd0f077f5..4e2dd611f 100644
--- a/npc/re/jobs/2-2/alchemist.txt
+++ b/npc/re/jobs/2-2/alchemist.txt
@@ -1,27 +1,22 @@
 //===== rAthena Script ======================================= 
-//= Alchemist Job Quest
-//===== By: ==================================================
-//= nestor_zulueta (Fusion), converted by Darkchild
+// Alchemist Job change Quest
+//===== By: ================================================== 
+//= Masao
+//= Credits: Muad_Dib
 //===== Current Version: ===================================== 
-//= 3.0
+//= 1.0
 //===== Compatible With: ===================================== 
-//= rAthena SVN
+//= Any rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Job quest for Alchemist classes
+//= [Translated from the Official]
+//= Job change Quest from Merchant -> Alchemist.
 //===== Additional Comments: ================================= 
-//= 2.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//=	No longer uses function "F_BlockHigh"
-//= 2.6 Corrected a bug in advanced class checking. [L0ne_W0lf]
-//= 2.7 Added missing checkweights. [L0ne_W0lf]
-//= 2.8 Fixed minor typo in test section. [L0ne_W0lf]
-//= 2.9 Added Quest Log commands. [Kisuka]
-//= 3.0 Removed the need for use of 'goto.' [L0ne_W0lf]
+//= 1.0 Updated to latest available official file. [Masao]
 //============================================================ 
 
-alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
-	mes "[Parmy Gianino]";
+alde_alche,27,185,5	script	Alchemist Guildsman	744,{
 	if (Upper == 1) {
+		mes "[Parmy Gianino]";
 		mes "Welcome to the";
 		mes "Alchemist Unio--";
 		mes "I-Impossible! How c-can";
@@ -36,8 +31,9 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 		mes "feeling about you...";
 		close;
 	}
-	if (BaseJob != Job_Merchant) {
-		if (BaseJob == Job_Alchemist) {
+	if ((Class != Job_Baby_Merchant) && (Class != Job_Merchant)) {
+		if (Class == Job_Baby_Alchemist || Class == Job_Alchemist) {
+			mes "[Parmy Gianino]";
 			mes "Welcome, " + strcharinfo(0) + ".";
 			mes "The Alchemist Union";
 			mes "is busy today, like always.";
@@ -50,7 +46,8 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 			mes "Everyone is hoping that the biotechnological studies will yield positive results. Speaking of which, I wonder how the Alchemists working on artificial life are doing...";
 			close;
 		}
-		else if (BaseClass == Job_Novice) {
+		if (Class == Job_Baby || Class == Job_Novice) {
+			mes "[Parmy Gianino]";
 			mes "Welcome to the";
 			mes "Alchemist Union.";
 			mes "We are recruiting";
@@ -67,6 +64,7 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 			mes "as a Merchant first.";
 			close;
 		}
+		mes "[Parmy Gianino]";
 		mes "Welcome to the";
 		mes "Alchemist Union.";
 		mes "We are recruiting";
@@ -77,12 +75,13 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 		mes "If you know any exceptional Merchants, by all means, please refer them to us. Those types of people tend to have a talent for Alchemy and experimentation~";
 		close;
 	}
-	if (ALCH_Q == 0) {
+	if (ALCMST_Q == 0) {
+		mes "[Parmy Gianino]";
 		mes "Welcome to the";
 		mes "Alchemist Union.";
 		mes "How may I help you?";
 		next;
-		switch(select("I would like to learn about Alchemists.:I want to become an Alchemist.:Nothing.")) {
+		switch (select("I would like to learn about Alchemists.:I want to become an Alchemist.:Nothing.")) {
 		case 1:
 			mes "[Parmy Gianino]";
 			mes "Alchemists study and create new substances and items out of existing materials. Our knowledge allows us to change the properties of chemicals at the atomic level.";
@@ -135,7 +134,8 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 			mes "you like to apply";
 			mes "for registration?";
 			next;
-			if (select("I would like to apply.:I'll do it later.") == 1) {
+			switch (select("I would like to apply.:I'll do it later.")) {
+			case 1:
 				if (JobLevel < 40) {
 					mes "[Parmy Gianino]";
 					mes "Hmmm...";
@@ -165,7 +165,7 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 				mes "Please sign";
 				mes "the application.";
 				next;
-				select(strcharinfo(0));
+				menu "",-;
 				mes "[Parmy Gianino]";
 				mes "Good, good. Now, if you have";
 				mes "the Zeny for your application fee ready, I will tell you which items you will need to bring. Now, pay attention.";
@@ -177,24 +177,22 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 					mes "Come back to me when you have 50,000 Zeny, otherwise we can't process your application.";
 					close;
 				}
-				set zeny,zeny-50000;
+				set Zeny, Zeny - 50000;
 				mes "[Parmy Gianino]";
 				mes "Let's see.";
-				mes "" + strcharinfo(0);
+				mes "" + strcharinfo(0) + "";
 				mes "needs to bring...";
-				switch(rand(1,3)) {
-				case 1:
-					set ALCH_Q,1;
+				set .@alche_m1, rand(1,3);
+				if (.@alche_m1 == 1) {
+					set ALCMST_Q,1;
 					setquest 2028;
 					mes "^551A8B7 Berserk Potions^000000.";
-					break;
-				case 2:
-					set ALCH_Q,2;
+					set ALCMST_Q,2;
 					setquest 2029;
 					mes "^551A8B100 Mini Furnaces^000000.";
-					break;
-				case 3:
-					set ALCH_Q,3;
+				}
+				else {
+					set ALCMST_Q,3;
 					setquest 2030;
 					mes "^551A8B7,500 Fire Arrows^000000.";
 				}
@@ -206,12 +204,13 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 				mes "as an Alchemist will begin.";
 				mes "See you soon~";
 				close;
+			case 2:
+				mes "[Parmy Gianino]";
+				mes "Talented Merchants";
+				mes "are always welcome here.";
+				mes "Please come back soon.";
+				close;
 			}
-			mes "[Parmy Gianino]";
-			mes "Talented Merchants";
-			mes "are always welcome here.";
-			mes "Please come back soon.";
-			close;
 		case 3:
 			mes "[Parmy Gianino]";
 			mes "Umm...";
@@ -220,8 +219,9 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 			close;
 		}
 	}
-	else if (ALCH_Q >= 1 && ALCH_Q <= 3) {
-		if (countitem(1006) > 0 && countitem(1005) > 0) {
+	if (ALCMST_Q == 1) {
+		if ((countitem(1006) > 0) && (countitem(1005) > 0)) {
+			mes "[Parmy Gianino]";
 			mes "Well now~!";
 			mes "You've brought an";
 			mes "Old Magic Book and";
@@ -234,16 +234,8 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 			mes "[Parmy Gianino]";
 			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) {
-				changequest 2028,2031;
-			}
-			else if(checkquest(2029) != -1) {
-				changequest 2029,2031;
-			}
-			else {
-				changequest 2030,2031;
-			}
+			set ALCMST_Q,4;
+			changequest 2028,2031;
 			next;
 			mes "[Parmy Gianino]";
 			mes "But before all of that, you need to speak to Raspuchin. I'm not really sure what you'll be talking about with him...";
@@ -252,31 +244,135 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 			mes "It shouldn't be anything extraordinary, but you're still required to speak to Raspuchin, since apparently he's a part of the Alchemist selection process.";
 			close;
 		}
-		switch(ALCH_Q) {
-		case 1: setarray .@items[0],657,7; break;
-		case 2: setarray .@items[0],612,100; break;
-		case 3: setarray .@items[0],1752,7500; break;
+		if (countitem(657) > 6) {
+			mes "[Parmy Gianino]";
+			mes "Seems like";
+			mes "you're all ready.";
+			mes "The Union will put";
+			mes "these items to good use.";
+			next;
+			delitem 657,7; //Berserk_Potion
+			mes "[Parmy Gianino]";
+			mes "Okay, now you need to learn";
+			mes "the basics to being an Alchemist and learn the procedures for mixing chemicals and medicines.";
+			set ALCMST_Q,4;
+			changequest 2028,2031;
+			next;
+			mes "[Parmy Gianino]";
+			mes "But before all of that, you need to speak to Raspuchin. I'm not really sure what you'll be talking about with him...";
+			next;
+			mes "[Parmy Gianino]";
+			mes "It shouldn't be anything extraordinary, but you're still required to speak to Raspuchin, since apparently he's a part of the Alchemist selection process.";
+			close;
 		}
-		if (countitem(.@items[0]) >= .@items[1]) {
+		mes "[Parmy Gianino]";
+		mes "Aren't you ready?";
+		mes "Like I said before,";
+		mes "you must bring";
+		mes "^551A8B7 Berserk Potions^000000.";
+		next;
+		mes "[Parmy Gianino]";
+		mes "Come back when you";
+		mes "have prepared the";
+		mes "required items.";
+		close;
+	}
+	if (ALCMST_Q == 2) {
+		if ((countitem(1006) > 0) && (countitem(1005) > 0)) {
+			mes "[Parmy Gianino]";
+			mes "Well now~!";
+			mes "You've brought an";
+			mes "Old Magic Book and";
+			mes "a Hammer of Blacksmith.";
+			mes "We'll put these items";
+			mes "to good use.";
+			next;
+			delitem 1006,1; //Old_Magic_Book
+			delitem 1005,1; //Hammer_Of_Blacksmith
+			mes "[Parmy Gianino]";
+			mes "Okay, now you need to learn";
+			mes "the basics to being an Alchemist and learn the procedures for mixing chemicals and medicines.";
+			set ALCMST_Q,4;
+			changequest 2029,2031;
+			next;
+			mes "[Parmy Gianino]";
+			mes "But before all of that, you need to speak to Raspuchin. I'm not really sure what you'll be talking about with him...";
+			next;
+			mes "[Parmy Gianino]";
+			mes "It shouldn't be anything extraordinary, but you're still required to speak to Raspuchin, since apparently he's a part of the Alchemist selection process.";
+			close;
+		}
+		if (countitem(612) > 99) {
+			mes "[Parmy Gianino]";
 			mes "Seems like";
 			mes "you're all ready.";
 			mes "The Union will put";
 			mes "these items to good use.";
 			next;
-			delitem .@items[0],.@items[1];
+			delitem 612,100; //Portable_Furnace
 			mes "[Parmy Gianino]";
 			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) {
-				changequest 2028,2031;
-			}
-			else if(checkquest(2029) != -1) {
-				changequest 2029,2031;
-			}
-			else {
-				changequest 2030,2031;
-			}
+			set ALCMST_Q,4;
+			changequest 2029,2031;
+			next;
+			mes "[Parmy Gianino]";
+			mes "But before all of that, you need to speak to Raspuchin. I'm not really sure what you'll be talking about with him...";
+			next;
+			mes "[Parmy Gianino]";
+			mes "It shouldn't be anything extraordinary, but you're still required to speak to Raspuchin, since apparently he's a part of the Alchemist selection process.";
+			close;
+		}
+		mes "[Parmy Gianino]";
+		mes "Aren't you ready?";
+		mes "Like I said before,";
+		mes "you must bring";
+		mes "^551A8B100 Mini Furnaces^000000.";
+		next;
+		mes "[Parmy Gianino]";
+		mes "Come back when you";
+		mes "have prepared the";
+		mes "required items.";
+		close;
+	}
+	if (ALCMST_Q == 3) {
+		if ((countitem(1006) > 0) && (countitem(1005) > 0)) {
+			mes "[Parmy Gianino]";
+			mes "Well now~!";
+			mes "You've brought an";
+			mes "Old Magic Book and";
+			mes "a Hammer of Blacksmith.";
+			mes "We'll put these items";
+			mes "to good use.";
+			next;
+			delitem 1006,1; //Old_Magic_Book
+			delitem 1005,1; //Hammer_Of_Blacksmith
+			mes "[Parmy Gianino]";
+			mes "Okay, now you need to learn";
+			mes "the basics to being an Alchemist and learn the procedures for mixing chemicals and medicines.";
+			set ALCMST_Q,4;
+			changequest 2030,2031;
+			next;
+			mes "[Parmy Gianino]";
+			mes "But before all of that, you need to speak to Raspuchin. I'm not really sure what you'll be talking about with him...";
+			next;
+			mes "[Parmy Gianino]";
+			mes "It shouldn't be anything extraordinary, but you're still required to speak to Raspuchin, since apparently he's a part of the Alchemist selection process.";
+			close;
+		}
+		if (countitem(1752) > 7499) {
+			mes "[Parmy Gianino]";
+			mes "Seems like";
+			mes "you're all ready.";
+			mes "The Union will put";
+			mes "these items to good use.";
+			next;
+			delitem 1752,7500; //Fire_Arrow
+			mes "[Parmy Gianino]";
+			mes "Okay, now you need to learn";
+			mes "the basics to being an Alchemist and learn the procedures for mixing chemicals and medicines.";
+			set ALCMST_Q,4;
+			changequest 2030,2031;
 			next;
 			mes "[Parmy Gianino]";
 			mes "But before all of that, you need to speak to Raspuchin. I'm not really sure what you'll be talking about with him...";
@@ -285,10 +381,11 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 			mes "It shouldn't be anything extraordinary, but you're still required to speak to Raspuchin, since apparently he's a part of the Alchemist selection process.";
 			close;
 		}
+		mes "[Parmy Gianino]";
 		mes "Aren't you ready?";
 		mes "Like I said before,";
 		mes "you must bring";
-		mes "^551A8B"+.@items[1]+" "+getitemname(.@items[0])+"s^000000.";
+		mes "^551A8B7500 Fire Arrows^000000.";
 		next;
 		mes "[Parmy Gianino]";
 		mes "Come back when you";
@@ -296,7 +393,8 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 		mes "required items.";
 		close;
 	}
-	else if (ALCH_Q == 4) {
+	if (ALCMST_Q == 4) {
+		mes "[Parmy Gianino]";
 		mes "Go and talk to";
 		mes "Mr. Raspuchin.";
 		mes "He's involved in the";
@@ -309,23 +407,22 @@ alde_alche,27,185,5	script	Alchemist Guildsman#am	744,{
 		mes "some simple questions.";
 		close;
 	}
-	else {
-		mes "Ah, I'm sorry, but";
-		mes "I'm busy right now~";
-		next;
-		mes "[Parmy Gianino]";
-		mes "Why don't you ask";
-		mes "someone else if you're";
-		mes "not sure who to visit";
-		mes "next? Good luck~";
-		close;
-	}
+	mes "[Parmy Gianino]";
+	mes "Ah, I'm sorry, but";
+	mes "I'm busy right now~";
+	next;
+	mes "[Parmy Gianino]";
+	mes "Why don't you ask";
+	mes "someone else if you're";
+	mes "not sure who to visit";
+	mes "next? Good luck~";
+	close;
 }
 
-alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
-	mes "[Raspuchin Gregory]";
-	if (BaseJob != Job_Merchant) {
-		if (BaseJob == Job_Alchemist) {
+alde_alche,175,107,3	script	Fastidious Alchemist	749,{
+	if ((Class != Job_Baby_Merchant) && (Class != Job_Merchant)) {
+		if (Class == Job_Baby_Alchemist || Class == Job_Alchemist) {
+			mes "[Raspuchin Gregory]";
 			mes "Heeheehee";
 			mes "keheheh~!";
 			mes "Eh? What do you want?!";
@@ -342,7 +439,8 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 			mes "Alchemist Union!";
 			close;
 		}
-		else if (BaseClass == Job_Novice) {
+		if (Class == Job_Baby || Class == Job_Novice) {
+			mes "[Raspuchin Gregory]";
 			mes "Heeheehee";
 			mes "keheheh~!";
 			mes "How cute, you've come";
@@ -355,34 +453,34 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 			mes "expect to leave so easily...";
 			close;
 		}
-		else {
-			mes "What is it?!";
-			mes "You're curious as";
-			mes "to what I'm doing?";
-			next;
-			mes "[Raspuchin Gregory]";
-			mes "Heehee";
-			mes "keheheh~!";
-			mes "Why, I'm busy";
-			mes "researching,";
-			mes "of course!";
-			next;
-			mes "[Raspuchin Gregory]";
-			mes "Once this";
-			mes "potion is complete...";
-			mes "You can use it to take";
-			mes "over an entire nation!";
-			next;
-			mes "[Raspuchin Gregory]";
-			mes "Hee hee hee!";
-			mes "Something this";
-			mes "dangerous has to";
-			mes "be kept a secret!";
-			mes "Understand?";
-			close;
-		}
+		mes "[Raspuchin Gregory]";
+		mes "What is it?!";
+		mes "You're curious as";
+		mes "to what I'm doing?";
+		next;
+		mes "[Raspuchin Gregory]";
+		mes "Heehee";
+		mes "keheheh~!";
+		mes "Why, I'm busy";
+		mes "researching,";
+		mes "of course!";
+		next;
+		mes "[Raspuchin Gregory]";
+		mes "Once this";
+		mes "potion is complete...";
+		mes "You can use it to take";
+		mes "over an entire nation!";
+		next;
+		mes "[Raspuchin Gregory]";
+		mes "Hee hee hee!";
+		mes "Something this";
+		mes "dangerous has to";
+		mes "be kept a secret!";
+		mes "Understand?";
+		close;
 	}
-	if (ALCH_Q == 0) {
+	if (ALCMST_Q == 0) {
+		mes "[Raspuchin Gregory]";
 		mes "Heeheehee";
 		mes "keheheh~!";
 		mes "What do you";
@@ -398,7 +496,8 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 		mes "dark enterprise!";
 		close;
 	}
-	else if (ALCH_Q >= 1 && ALCH_Q <= 3) {
+	if ((ALCMST_Q == 1) || (ALCMST_Q == 2) || (ALCMST_Q == 3)) {
+		mes "[Raspuchin Gregory]";
 		mes "Heeheehee";
 		mes "keheheh~!";
 		mes "What do you";
@@ -414,133 +513,469 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 		mes "Even if you tried studying for a thousand years, maybe even more, it'd be useless to you! Forget about it and just worry about your store!";
 		close;
 	}
-	else if ((ALCH_Q == 4) || (ALCH_Q == 5)) {
-		if (ALCH_Q == 4) {
-			mes "Heeheehee";
-			mes "keheheh~!";
-			mes "What do you";
-			mes "want, kid?";
+	if (ALCMST_Q == 4) {
+		mes "[Raspuchin Gregory]";
+		mes "Heeheehee";
+		mes "keheheh~!";
+		mes "What do you";
+		mes "want, kid?";
+		next;
+		mes "[Raspuchin Gregory]";
+		mes "What...?";
+		mes "Join the Union!?";
+		mes "I don't like it...";
+		mes "I just don't...!";
+		next;
+		mes "[Raspuchin Gregory]";
+		mes "Nowadays, anyone thinks they can";
+		mes "be Alchemists just by knowing how to mix a few herbs. That's why my interview is necessary.";
+		next;
+		mes "[Raspuchin Gregory]";
+		mes "Heeheehee";
+		mes "keheheh~!";
+		mes "I plan on weeding out all the dumb and incompetent, and chase them";
+		mes "all away! We don't need morons!";
+		next;
+		if (JobLevel == 50) {
+			mes "[Raspuchin Gregory]";
+			mes "Wait...";
+			mes "Maybe I've";
+			mes "misjudged you.";
+			if (Sex == 1) {
+				mes "You might be a pretty boy,";
+				mes "but I can tell you're smart";
+				mes "from your eyes.";
+			}
+			else {
+				mes "Huh. You're a cutie alright,";
+				mes "but I can tell you've got brains.";
+			}
 			next;
 			mes "[Raspuchin Gregory]";
-			mes "What...?";
-			mes "Join the Union!?";
-			mes "I don't like it...";
-			mes "I just don't...!";
+			mes "You're not just some stupid kid.";
+			mes "I can tell youve gone through some rough times as a Merchant. Excellent. Keh heh heh~";
 			next;
 			mes "[Raspuchin Gregory]";
-			mes "Nowadays, anyone thinks they can";
-			mes "be Alchemists just by knowing how to mix a few herbs. That's why my interview is necessary.";
+			mes "Fine, just so we don't insult each other's intelligence, I'll just let you pass the interview.";
 			next;
 			mes "[Raspuchin Gregory]";
-			mes "Heeheehee";
-			mes "keheheh~!";
-			mes "I plan on weeding out all the dumb and incompetent, and chase them";
-			mes "all away! We don't need morons!";
-			next;
-			if (JobLevel == 50) {
-				mes "[Raspuchin Gregory]";
-				mes "Wait...";
-				mes "Maybe I've";
-				mes "misjudged you.";
-				if (sex == 1) {
-					mes "You might be a pretty boy,";
-					mes "but I can tell you're smart";
-					mes "from your eyes.";
-				}
-				else {
-					mes "Huh. You're a cutie alright,";
-					mes "but I can tell you've got brains.";
-				}
-				next;
-				mes "[Raspuchin Gregory]";
-				mes "You're not just some stupid kid.";
-				mes "I can tell youve gone through some rough times as a Merchant. Excellent. Keh heh heh~";
-				next;
-				mes "[Raspuchin Gregory]";
-				mes "Fine, just so we don't insult each other's intelligence, I'll just let you pass the interview.";
-				next;
-				mes "[Raspuchin Gregory]";
-				mes "So hurry up, become an Alchemist, do some good research, and you might turn out to be of some help to me. Hahahahahaha~!";
-				next;
-				mes "[Raspuchin Gregory]";
-				mes "Now go to Darwin!";
-				mes "He'll teach you how to do the experiments. Just tell him that";
-				mes "I sent you.";
-				set ALCH_Q,6;
-				close;
+			mes "So hurry up, become an Alchemist, do some good research, and you might turn out to be of some help to me. Hahahahahaha~!";
+			next;
+			mes "[Raspuchin Gregory]";
+			mes "Now go to Darwin!";
+			mes "He'll teach you how to do the experiments. Just tell him that";
+			mes "I sent you.";
+			set ALCMST_Q,6;
+			changequest 2031,2032;
+			close;
+		}
+		mes "[Raspuchin Gregory]";
+		mes "Surprised, are you?";
+		mes "Keheheh~ If you thought";
+		mes "becoming an Alchemist was";
+		mes "just a matter of changing";
+		mes "your clothes, then you're";
+		mes "sadly mistaken.";
+		next;
+		mes "[Raspuchin Gregory]";
+		mes "Now, try solving";
+		mes "all these problems.";
+		mes "Let's see how smart";
+		mes "really are.";
+		next;
+		set .@alche_s, rand(1,3);
+		set @w_point,0;
+		if (.@alche_s == 1) {
+			mes "[Raspuchin Gregory]";
+			mes "12 + 23 + 34 + 45 = ?";
+			next;
+			input .@input;
+			if (.@input != 114) {
+				set @w_point,@w_point + 1;
 			}
-			else {
-				mes "[Raspuchin Gregory]";
-				mes "Surprised, are you?";
-				mes "Keheheh~ If you thought";
-				mes "becoming an Alchemist was";
-				mes "just a matter of changing";
-				mes "your clothes, then you're";
-				mes "sadly mistaken.";
-				next;
-				mes "[Raspuchin Gregory]";
-				mes "Now, try solving";
-				mes "all these problems.";
-				mes "Let's see how smart";
-				mes "really are.";
+			mes "[Raspuchin Gregory]";
+			mes "1000 - 36 - 227 - 348 = ?";
+			next;
+			input .@input;
+			if (.@input != 389) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "14 * 17 * 3 = ?";
+			next;
+			input .@input;
+			if (.@input != 714) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "9765 / 3 / 5 / 7 = ?";
+			next;
+			input .@input;
+			if (.@input != 93) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "(47 * 28) - (1376 / 4) = ?";
+			next;
+			input .@input;
+			if (.@input != 972) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "(2646 / 7) + (13 * 28) = ?";
+			next;
+			input .@input;
+			if (.@input != 742) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "How much do";
+			mes "12 Red Potions,";
+			mes "1 Butterfly Wing";
+			mes "and 5 Fly Wings cost";
+			mes "after a 24 % discount?";
+			next;
+			input .@input;
+			if (.@input != 909) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "What is the";
+			mes "total weight of";
+			mes "3 Scimiters, 2 Helms";
+			mes "and 1 Long Coat?";
+			next;
+			input .@input;
+			if (.@input != 450) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "What is the";
+			mes "total defense of";
+			mes "a Biretta, Mantle,";
+			mes "Opera Mask, Ribbon,";
+			mes "Muffler, Boots, and";
+			mes "Ear Muffs?";
+			next;
+			input .@input;
+			if (.@input != 20) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "If you buy 5 Helms";
+			mes "with a 24 % discount";
+			mes "and sell it at 20 %,";
+			mes "how much profit";
+			mes "do you earn?";
+			next;
+			input .@input;
+			if (.@input != 8800) {
+				set @w_point,@w_point + 1;
 			}
 		}
-		else if (ALCH_Q == 5) {
-			mes "What...?!";
-			mes "You want to take";
-			mes "the test again?!";
-			mes "I thought I told";
-			mes "you to leave!";
+		if (.@alche_s == 2) {
+			mes "[Raspuchin Gregory]";
+			mes "13 + 25 + 37 + 48 = ?";
+			next;
+			input .@input;
+			if (.@input != 123) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "1000 - 58 - 214 - 416 = ?";
+			next;
+			input .@input;
+			if (.@input != 312) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "12 * 24 * 3 = ?";
+			next;
+			input .@input;
+			if (.@input != 864) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "10530 / 3 / 5 / 2 = ?";
+			next;
+			input .@input;
+			if (.@input != 351) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "(35 * 19) - (1792 / 7) = ?";
+			next;
+			input .@input;
+			if (.@input != 409) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "(2368 / 8) + (24 * 17) = ?";
 			next;
+			input .@input;
+			if (.@input != 704) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
-			mes "I don't like it...";
-			mes "I don't like this!";
+			mes "(2646 / 7) + (13 * 28) = ?";
 			next;
+			input .@input;
+			if (.@input != 742) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
-			mes "Fine...";
-			mes "I'll try to overlook your pitiful performance last time and give";
-			mes "you another chance. Don't screw";
-			mes "up again, got it?";
+			mes "What is the";
+			mes "total price of";
+			mes "15 Green Potions,";
+			mes "6 Magnifiers and";
+			mes "4 Traps after";
+			mes "a 24 % discount?";
 			next;
+			input .@input;
+			if (.@input != 934) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
-			mes "Now then,";
-			mes "give me all the";
-			mes "^551A8Bright^000000 answers";
-			mes "this time.";
+			mes "What is the";
+			mes "total weight of";
+			mes "3 Ring Pommel Sabers,";
+			mes "4 Caps, and 2 Boots?";
+			next;
+			input .@input;
+			if (.@input != 550) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "What is the";
+			mes "total defense of";
+			mes "a Buckler, Long Coat,";
+			mes "Gas Mask, Big Ribbon,";
+			mes "Cute Ribbon, Sakkat,";
+			mes "and Glasses?";
+			next;
+			input .@input;
+			if (.@input != 16) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "How much profit do you";
+			mes "make if you buy Tights";
+			mes "at a 24 % discount and";
+			mes "sell it at 20 % of";
+			mes "the normal price?";
+			next;
+			input .@input;
+			if (.@input != 8520) {
+				set @w_point,@w_point + 1;
+			}
 		}
+		if (.@alche_s == 3) {
+			mes "[Raspuchin Gregory]";
+			mes "12 + 23 + 34 + 45 = ?";
+			next;
+			input .@input;
+			if (.@input != 114) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "1000 - 58 - 214 - 416 = ?";
+			next;
+			input .@input;
+			if (.@input != 312) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "14 * 17 * 3 = ?";
+			next;
+			input .@input;
+			if (.@input != 714) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "10530 / 3 / 5 / 2 = ?";
+			next;
+			input .@input;
+			if (.@input != 351) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "(47 * 28) - (1376 / 4) = ?";
+			next;
+			input .@input;
+			if (.@input != 972) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "(2646 / 7) + (13 * 28) = ?";
+			next;
+			input .@input;
+			if (.@input != 742) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "What is the";
+			mes "total cost of";
+			mes "6 Red Potions,";
+			mes "7 Green Potions,";
+			mes "and 8 Fly Wings";
+			mes "after a 24 % discount?";
+			next;
+			input .@input;
+			if (.@input != 798) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "What is the";
+			mes "total weight of";
+			mes "2 Ring Pommel Sabers,";
+			mes "3 Caps, and 3 boots?";
+			next;
+			input .@input;
+			if (.@input != 480) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "What is the";
+			mes "total defense of";
+			mes "a Mirror Shield, Mr. Smile, Leather Jacket, Silk Robe, Wedding Veil, Muffler, and Eye Patch?";
+			next;
+			input .@input;
+			if (.@input != 12) {
+				set @w_point,@w_point + 1;
+			}
+			mes "[Raspuchin Gregory]";
+			mes "If you buy 4 Padded Armors";
+			mes "at a 25% discount and sell";
+			mes "them at 20% of the original";
+			mes "price, how much profit would";
+			mes "you make from this sale?";
+			next;
+			input .@input;
+			if (.@input != 7680) {
+				set @w_point,@w_point + 1;
+			}
+		}
+		if (@w_point == 0) {
+			mes "[Raspuchin Gregory]";
+			mes "Ooh...";
+			mes "Excellent! Great!";
+			mes "You got them all correct!?";
+			mes "Keheheh, I have no choice but to acknowledge you...";
+			next;
+		}
+		if (@w_point == 1) {
+			mes "[Raspuchin Gregory]";
+			mes "You got one wrong!";
+			mes "But I'll let it slide.";
+			mes "You pass the interview!";
+			next;
+		}
+		else {
+			set ALCMST_Q,5;
+			mes "[Raspuchin Gregory]";
+			mes "Keheheh! Idiot!";
+			mes "Just listening to your";
+			mes "answers is making me feel";
+			mes "stupider! You might as well";
+			mes "have got them all wrong!";
+			next;
+			mes "[Raspuchin Gregory]";
+			mes "How can a person that";
+			mes "can't even answer all of";
+			mes "these simple questions think";
+			mes "of becoming an Alchemist?!";
+			next;
+			mes "[Raspuchin Gregory]";
+			mes "Hm...?";
+			mes "Did you get";
+			mes "any right?";
+			next;
+			mes "[Raspuchin Gregory]";
+			mes "Fool! Even if you make one little mistake, everything goes wrong";
+			mes "in Alchemy! Now get out of here!";
+			mes "You make me sick!";
+			close;
+		}
+		mes "[Raspuchin Gregory]";
+		mes "So hurry up, become an Alchemist, do some good research, and you might turn out to be of some help to me. Hahahahahaha~!";
 		next;
-		switch(rand(1,3)) {
-		case 1:
+		mes "[Raspuchin Gregory]";
+		mes "Now go to Darwin!";
+		mes "He'll teach you how to do the experiments. Just tell him that";
+		mes "I sent you.";
+		set ALCMST_Q,6;
+		changequest 2031,2032;
+		close;
+	}
+	if (ALCMST_Q == 5) {
+		mes "[Raspuchin Gregory]";
+		mes "What...?!";
+		mes "You want to take";
+		mes "the test again?!";
+		mes "I thought I told";
+		mes "you to leave!";
+		next;
+		mes "[Raspuchin Gregory]";
+		mes "I don't like it...";
+		mes "I don't like this!";
+		next;
+		mes "[Raspuchin Gregory]";
+		mes "Fine...";
+		mes "I'll try to overlook your pitiful performance last time and give";
+		mes "you another chance. Don't screw";
+		mes "up again, got it?";
+		next;
+		mes "[Raspuchin Gregory]";
+		mes "Now then,";
+		mes "give me all the";
+		mes "^551A8Bright^000000 answers";
+		mes "this time.";
+		next;
+		set .@alche_s, rand(1,3);
+		set @w_point,0;
+		if (.@alche_s == 1) {
 			mes "[Raspuchin Gregory]";
 			mes "12 + 23 + 34 + 45 = ?";
 			next;
 			input .@input;
-			if (.@input != 114) set .@w_point,.@w_point+1;
+			if (.@input != 114) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "1000 - 36 - 227 - 348 = ?";
 			next;
 			input .@input;
-			if (.@input != 389) set .@w_point,.@w_point+1;
+			if (.@input != 389) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "14 * 17 * 3 = ?";
 			next;
 			input .@input;
-			if (.@input != 714) set .@w_point,.@w_point+1;
+			if (.@input != 714) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "9765 / 3 / 5 / 7 = ?";
 			next;
 			input .@input;
-			if (.@input != 93) set .@w_point,.@w_point+1;
+			if (.@input != 93) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "(47 * 28) - (1376 / 4) = ?";
 			next;
 			input .@input;
-			if (.@input != 972) set .@w_point,.@w_point+1;
+			if (.@input != 972) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "(2646 / 7) + (13 * 28) = ?";
 			next;
 			input .@input;
-			if (.@input != 742) set .@w_point,.@w_point+1;
+			if (.@input != 742) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "How much do";
 			mes "12 Red Potions,";
@@ -549,7 +984,9 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 			mes "after a 24 % discount?";
 			next;
 			input .@input;
-			if (.@input != 909) set .@w_point,.@w_point+1;
+			if (.@input != 909) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "What is the";
 			mes "total weight of";
@@ -557,7 +994,9 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 			mes "and 1 Long Coat?";
 			next;
 			input .@input;
-			if (.@input != 450) set .@w_point,.@w_point+1;
+			if (.@input != 450) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "What is the";
 			mes "total defense of";
@@ -567,53 +1006,71 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 			mes "Ear Muffs?";
 			next;
 			input .@input;
-			if (.@input != 20) set .@w_point,.@w_point+1;
+			if (.@input != 20) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "If you buy 5 Helms";
 			mes "with a 24 % discount";
-			mes "and sell it at 20";
+			mes "and sell it at 20 %,";
 			mes "how much profit";
 			mes "do you earn?";
 			next;
 			input .@input;
-			if (.@input != 8800) set .@w_point,.@w_point+1;
-			break;
-		case 2:
+			if (.@input != 8800) {
+				set @w_point,@w_point + 1;
+			}
+		}
+		if (.@alche_s == 2) {
 			mes "[Raspuchin Gregory]";
 			mes "13 + 25 + 37 + 48 = ?";
 			next;
 			input .@input;
-			if (.@input != 123) set .@w_point,.@w_point+1;
+			if (.@input != 123) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "1000 - 58 - 214 - 416 = ?";
 			next;
 			input .@input;
-			if (.@input != 312) set .@w_point,.@w_point+1;
+			if (.@input != 312) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "12 * 24 * 3 = ?";
 			next;
 			input .@input;
-			if (.@input != 864) set .@w_point,.@w_point+1;
+			if (.@input != 864) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "10530 / 3 / 5 / 2 = ?";
 			next;
 			input .@input;
-			if (.@input != 351) set .@w_point,.@w_point+1;
+			if (.@input != 351) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "(35 * 19) - (1792 / 7) = ?";
 			next;
 			input .@input;
-			if (.@input != 409) set .@w_point,.@w_point+1;
+			if (.@input != 409) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "(2368 / 8) + (24 * 17) = ?";
 			next;
 			input .@input;
-			if (.@input != 704) set .@w_point,.@w_point+1;
+			if (.@input != 704) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "(2646 / 7) + (13 * 28) = ?";
 			next;
 			input .@input;
-			if (.@input != 742) set .@w_point,.@w_point+1;
+			if (.@input != 742) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "What is the";
 			mes "total price of";
@@ -623,7 +1080,9 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 			mes "a 24 % discount?";
 			next;
 			input .@input;
-			if (.@input != 934) set .@w_point,.@w_point+1;
+			if (.@input != 934) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "What is the";
 			mes "total weight of";
@@ -631,7 +1090,9 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 			mes "4 Caps, and 2 Boots?";
 			next;
 			input .@input;
-			if (.@input != 550) set .@w_point,.@w_point+1;
+			if (.@input != 550) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "What is the";
 			mes "total defense of";
@@ -641,7 +1102,9 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 			mes "and Glasses?";
 			next;
 			input .@input;
-			if (.@input != 16) set .@w_point,.@w_point+1;
+			if (.@input != 16) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "How much profit do you";
 			mes "make if you buy Tights";
@@ -650,39 +1113,53 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 			mes "the normal price?";
 			next;
 			input .@input;
-			if (.@input != 8520) set .@w_point,.@w_point+1;
-			break;
-		case 3:
+			if (.@input != 8520) {
+				set @w_point,@w_point + 1;
+			}
+		}
+		if (.@alche_s == 3) {
 			mes "[Raspuchin Gregory]";
 			mes "12 + 23 + 34 + 45 = ?";
 			next;
 			input .@input;
-			if (.@input != 114) set .@w_point,.@w_point+1;
+			if (.@input != 114) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "1000 - 58 - 214 - 416 = ?";
 			next;
 			input .@input;
-			if (.@input != 312) set .@w_point,.@w_point+1;
+			if (.@input != 312) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "14 * 17 * 3 = ?";
 			next;
 			input .@input;
-			if (.@input != 714) set .@w_point,.@w_point+1;
+			if (.@input != 714) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "10530 / 3 / 5 / 2 = ?";
 			next;
 			input .@input;
-			if (.@input != 351) set .@w_point,.@w_point+1;
+			if (.@input != 351) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "(47 * 28) - (1376 / 4) = ?";
 			next;
 			input .@input;
-			if (.@input != 972) set .@w_point,.@w_point+1;
+			if (.@input != 972) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "(2646 / 7) + (13 * 28) = ?";
 			next;
 			input .@input;
-			if (.@input != 742) set .@w_point,.@w_point+1;
+			if (.@input != 742) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "What is the";
 			mes "total cost of";
@@ -692,7 +1169,9 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 			mes "after a 24 % discount?";
 			next;
 			input .@input;
-			if (.@input != 798) set .@w_point,.@w_point+1;
+			if (.@input != 798) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "What is the";
 			mes "total weight of";
@@ -700,25 +1179,31 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 			mes "3 Caps, and 3 boots?";
 			next;
 			input .@input;
-			if (.@input != 480) set .@w_point,.@w_point+1;
+			if (.@input != 480) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "What is the";
 			mes "total defense of";
 			mes "a Mirror Shield, Mr. Smile, Leather Jacket, Silk Robe, Wedding Veil, Muffler, and Eye Patch?";
 			next;
 			input .@input;
-			if (.@input != 12) set .@w_point,.@w_point+1;
+			if (.@input != 12) {
+				set @w_point,@w_point + 1;
+			}
 			mes "[Raspuchin Gregory]";
 			mes "If you buy 4 Padded Armors";
-			mes "at a 24% discount and sell";
+			mes "at a 25% discount and sell";
 			mes "them at 20% of the original";
 			mes "price, how much profit would";
 			mes "you make from this sale?";
 			next;
 			input .@input;
-			if (.@input != 7680) set w_point,w_point+1;
+			if (.@input != 7680) {
+				set @w_point,@w_point + 1;
+			}
 		}
-		if (.@w_point == 0) {
+		if (@w_point == 0) {
 			mes "[Raspuchin Gregory]";
 			mes "Ooh...";
 			mes "Excellent! Great!";
@@ -726,14 +1211,14 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 			mes "Keheheh, I have no choice but to acknowledge you...";
 			next;
 		}
-		else if (.@w_point == 1) {
+		if (@w_point == 1) {
 			mes "[Raspuchin Gregory]";
 			mes "You got one wrong!";
 			mes "But I'll let it slide.";
 			mes "You pass the interview!";
 			next;
 		}
-		else if (.@w_point == 2 && ALCH_Q == 5) {
+		if (@w_point == 2) {
 			mes "[Raspuchin Gregory]";
 			mes "You've got serious";
 			mes "weaknesses in math,";
@@ -741,7 +1226,7 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 			next;
 		}
 		else {
-			set ALCH_Q,5;
+			set ALCMST_Q,5;
 			mes "[Raspuchin Gregory]";
 			mes "Keheheh! Idiot!";
 			mes "Just listening to your";
@@ -773,11 +1258,11 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 		mes "Now go to Darwin!";
 		mes "He'll teach you how to do the experiments. Just tell him that";
 		mes "I sent you.";
-		set ALCH_Q,6;
-		changequest 2031,2032;
+		set ALCMST_Q,6;
 		close;
 	}
-	else if (ALCH_Q == 6) {
+	if (ALCMST_Q == 6) {
+		mes "[Raspuchin Gregory]";
 		mes "What are you doing?";
 		mes "Go and find Darwin now.";
 		next;
@@ -786,13 +1271,14 @@ alde_alche,175,107,3	script	Fastidious Alchemist#am	749,{
 		mes "Don't think this is the end of it!";
 		close;
 	}
+	mes "[Raspuchin Gregory]";
 	mes "Keheheheheheheheh~";
 	mes "Don't think this is the end of it!";
 	close;
 }
 
-alde_alche,13,15,7	script	Studying Man#am	750,{
-	if (checkweight(1201,1) == 0) {
+alde_alche,13,15,7	script	Studying Man	750,{
+	if (checkweight(1201,3) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you are carrying -";
 		mes "- too many items with you. -";
@@ -800,9 +1286,9 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 		mes "- after you store some items into kafra storage. -";
 		close;
 	}
-	mes "[Darwin]";
-	if (BaseJob != Job_Merchant) {
-		if (BaseJob == Job_Alchemist) {
+	if ((Class != Job_Baby_Merchant) && (Class != Job_Merchant)) {
+		if (Class == Job_Baby_Alchemist || Class == Job_Alchemist) {
+			mes "[Darwin]";
 			mes "Ah...";
 			mes "You...";
 			mes "You've become";
@@ -822,28 +1308,28 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 			mes "My love...";
 			close;
 		}
-		else {
-			mes "When you have";
-			mes "your dreams, you";
-			mes "have everything.";
-			mes "Without them, you have";
-			mes "nothing more to lose.";
-			next;
-			mes "[Darwin]";
-			mes "These cursed eyes...";
-			mes "They've lost sight of";
-			mes "my dreams a long time ago.";
-			mes "Ha ha ha ha...";
-			next;
-			mes "[Darwin]";
-			mes "Does paradise";
-			mes "really exist...?";
-			mes "Not without my love...";
-			mes "Not without Harmona...";
-			close;
-		}
+		mes "[Darwin]";
+		mes "When you have";
+		mes "your dreams, you";
+		mes "have everything.";
+		mes "Without them, you have";
+		mes "nothing more to lose.";
+		next;
+		mes "[Darwin]";
+		mes "These cursed eyes...";
+		mes "They've lost sight of";
+		mes "my dreams a long time ago.";
+		mes "Ha ha ha ha...";
+		next;
+		mes "[Darwin]";
+		mes "Does paradise";
+		mes "really exist...?";
+		mes "Not without my love...";
+		mes "Not without Harmona...";
+		close;
 	}
-	if (ALCH_Q == 6) {
+	if (ALCMST_Q == 6) {
+		mes "[Darwin]";
 		mes "...";
 		next;
 		mes "[Darwin]";
@@ -856,7 +1342,7 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 		mes "Who is it...?";
 		next;
 		monster "alde_alche",13,15,"Wolf",1013,1;
-		killmonsterall "alde_alche";
+		killmonster "alde_alche","Studying Man::OnMyMobDead";
 		mes "[Darwin]";
 		mes "A wolf?";
 		mes "Or a human?";
@@ -883,7 +1369,7 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 		mes "What brings you";
 		mes "to this kind of place?";
 		next;
-		switch(select("I want to learn how to experiment.:Tell me more about flowers.:Nothing.")) {
+		switch (select("I want to learn how to experiment.:Tell me more about flowers.:Nothing.")) {
 		case 1:
 			mes "[Darwin]";
 			mes "You wish to";
@@ -914,7 +1400,7 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 			mes "^551A8B1 Red Herb^000000,";
 			mes "^551A8B1 Yellow Herb^000000 and";
 			mes "^551A8B1 White Herb^000000.";
-			set ALCH_Q,7;
+			set ALCMST_Q,7;
 			changequest 2032,2033;
 			next;
 			mes "[Darwin]";
@@ -975,7 +1461,8 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 			close;
 		}
 	}
-	else if (ALCH_Q == 7) {
+	if (ALCMST_Q == 7) {
+		mes "[Darwin]";
 		mes "...";
 		mes "......";
 		next;
@@ -1014,7 +1501,8 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 			mes "as to let me have this flower?";
 			mes "I'm sure that this is the Moonlight Flower that I've been seeking!";
 			next;
-			if (select("Sorry, I can't give it to you.:I brought it to give to you.") == 1) {
+			switch (select("Sorry, I can't give it to you.:I brought it to give to you.")) {
+			case 1:
 				mes "[Darwin]";
 				mes "I understand.";
 				mes "You can't give";
@@ -1030,71 +1518,73 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 				mes "somewhere else. It brings";
 				mes "back too many memories...";
 				close;
+			case 2:
+				mes "[Darwin]";
+				mes "Are you";
+				mes "serious?!";
+				mes "Thank you!";
+				mes "Such a precious flower.";
+				mes "Ah, Harmona, my love...";
+				next;
+				mes "[Darwin]";
+				mes "Yes...";
+				mes "I shall repay you for this.";
+				mes "I shall plant all of my knowledge of Alchemy directly into your mind...";
+				next;
+				mes "[Darwin]";
+				mes "Open your eyes wide,";
+				mes "and look into my eyes!!";
+				mes "Don't stop until the end!!";
+				next;
+				mes "Lorem ipsum dolor sit amet,";
+				next;
+				mes "Lorem ipsum dolor sit amet,";
+				mes "consectetuer adipiscing elit.";
+				next;
+				mes "Lorem ipsum dolor sit amet,";
+				mes "consectetuer adipiscing elit.";
+				mes "Aenean fermentum ullamcorper.";
+				next;
+				mes "Lorem ipsum dolor sit amet,";
+				mes "consectetuer adipiscing elit.";
+				mes "Aenean fermentum ullamcorper.";
+				mes "Vestibulum ante ipsum primis in";
+				next;
+				mes "Lorem ipsum dolor sit amet,";
+				mes "consectetuer adipiscing elit.";
+				mes "Aenean fermentum ullamcorper.";
+				mes "Vestibulum ante ipsum primis in";
+				mes "faucibus orci luctus et ultrices";
+				next;
+				mes "Lorem ipsum dolor sit amet,";
+				mes "consectetuer adipiscing elit.";
+				mes "Aenean fermentum ullamcorper.";
+				mes "Vestibulum ante ipsum primis in";
+				mes "faucibus orci luctus et ultrices";
+				mes "posuere cubilia Curae; Morbi";
+				next;
+				mes "Lorem ipsum dolor sit amet,";
+				mes "consectetuer adipiscing elit.";
+				mes "Aenean fermentum ullamcorper.";
+				mes "Vestibulum ante ipsum primis in";
+				mes "faucibus orci luctus et ultrices";
+				mes "posuere cubilia Curae; Morbi";
+				mes "massa, fermentum vitae...";
+				next;
+				delitem 710,1; //Illusion_Flower
+				mes "[Darwin]";
+				mes "^666666*Gasp...*^000000";
+				mes "You are now";
+				mes "an Alchemist!!";
+				mes "Go to the Union";
+				mes "and cast away the last";
+				mes "vestiges of Merchant life!!";
+				set ALCMST_Q,40;
+				changequest 2033,2034;
+				close;
 			}
-			mes "[Darwin]";
-			mes "Are you";
-			mes "serious?!";
-			mes "Thank you!";
-			mes "Such a precious flower.";
-			mes "Ah, Harmona, my love...";
-			next;
-			mes "[Darwin]";
-			mes "Yes...";
-			mes "I shall repay you for this.";
-			mes "I shall plant all of my knowledge of Alchemy directly into your mind...";
-			next;
-			mes "[Darwin]";
-			mes "Open your eyes wide,";
-			mes "and look into my eyes!!";
-			mes "Don't stop until the end!!";
-			next;
-			mes "Lorem ipsum dolor sit amet,";
-			next;
-			mes "Lorem ipsum dolor sit amet,";
-			mes "consectetuer adipiscing elit.";
-			next;
-			mes "Lorem ipsum dolor sit amet,";
-			mes "consectetuer adipiscing elit.";
-			mes "Aenean fermentum ullamcorper.";
-			next;
-			mes "Lorem ipsum dolor sit amet,";
-			mes "consectetuer adipiscing elit.";
-			mes "Aenean fermentum ullamcorper.";
-			mes "Vestibulum ante ipsum primis in";
-			next;
-			mes "Lorem ipsum dolor sit amet,";
-			mes "consectetuer adipiscing elit.";
-			mes "Aenean fermentum ullamcorper.";
-			mes "Vestibulum ante ipsum primis in";
-			mes "faucibus orci luctus et ultrices";
-			next;
-			mes "Lorem ipsum dolor sit amet,";
-			mes "consectetuer adipiscing elit.";
-			mes "Aenean fermentum ullamcorper.";
-			mes "Vestibulum ante ipsum primis in";
-			mes "faucibus orci luctus et ultrices";
-			mes "posuere cubilia Curae; Morbi";
-			next;
-			mes "Lorem ipsum dolor sit amet,";
-			mes "consectetuer adipiscing elit.";
-			mes "Aenean fermentum ullamcorper.";
-			mes "Vestibulum ante ipsum primis in";
-			mes "faucibus orci luctus et ultrices";
-			mes "posuere cubilia Curae; Morbi";
-			mes "massa, fermentum vitae...";
-			next;
-			delitem 710,1; //Illusion_Flower
-			mes "[Darwin]";
-			mes "^666666*Gasp...*^000000";
-			mes "You are now";
-			mes "an Alchemist!!";
-			mes "Go to the Union";
-			mes "and cast away the last";
-			mes "vestiges of Merchant life!!";
-			set ALCH_Q,40;
-			close;
 		}
-		else if (countitem(7134) > 2 && countitem(713) > 2 && countitem(507) > 0 && countitem(508) > 0 && countitem(509) > 0) {
+		if ((countitem(7134) > 2) && (countitem(713) > 2) && (countitem(507) > 0) && (countitem(508) > 0) && (countitem(509) > 0)) {
 			mes "[Darwin]";
 			mes "Seems like you have everything ready. As promised, I will teach you how to make simple medicine.";
 			next;
@@ -1121,27 +1611,27 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 			mes "Now, make some medicine";
 			mes "using the simple procedure";
 			mes "I just explained to you.";
-			set w_point,0;
+			set @w_point,0;
 			next;
-			switch(select("Prepare the Medicine Bowl.:Put the Medicine Bowl on your head.:Kick the Medicine Bowl.")) {
+			switch (select("Prepare the Medicine Bowl.:Put the Medicine Bowl on your head.:Kick the Medicine Bowl.")) {
 			case 1:
 				break;
 			case 2:
-				set .@w_point,.@w_point+1;
+				set @w_point,@w_point + 1;
 				mes "[Darwin]";
 				mes "What...?";
 				next;
 				break;
 			case 3:
-				set .@w_point,.@w_point+1;
+				set @w_point,@w_point + 1;
 				mes "[Darwin]";
 				mes "No!";
 				next;
 				break;
 			}
-			switch(select("Put some dirt in the Medicine Bowl.:Put some Herbs in the Medicine Bowl.:Put a Harp in the Medicine Bowl.")) {
+			switch (select("Put some dirt in the Medicine Bowl.:Put some Herbs in the Medicine Bowl.:Put a Harp in the Medicine Bowl.")) {
 			case 1:
-				set .@w_point,.@w_point+1;
+				set @w_point,@w_point + 1;
 				mes "[Darwin]";
 				mes "...Eh!?";
 				mes "That's not";
@@ -1151,7 +1641,7 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 			case 2:
 				break;
 			case 3:
-				set .@w_point,.@w_point+1;
+				set @w_point,@w_point + 1;
 				mes "[Darwin]";
 				mes "A Harp?";
 				mes "And how would";
@@ -1159,18 +1649,18 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 				next;
 				break;
 			}
-			switch(select("Crush the Herbs.:Crush the Medicine Bowl.:Crush Darwin's foot.")) {
+			switch (select("Crush the Herbs.:Crush the Medicine Bowl.:Crush Darwin's foot.")) {
 			case 1:
 				break;
 			case 2:
-				set .@w_point,.@w_point+1;
+				set @w_point,@w_point + 1;
 				mes "[Darwin]";
 				mes "Wh-What are";
 				mes "you doing!?";
 				next;
 				break;
 			case 3:
-				set .@w_point,.@w_point+1;
+				set @w_point,@w_point + 1;
 				mes "[Darwin]";
 				mes "Agh...!";
 				mes "What do you";
@@ -1179,16 +1669,16 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 				next;
 				break;
 			}
-			switch(select("Spray clean water.:Drink clean water.:Pour clean water.")) {
+			switch (select("Spray clean water.:Drink clean water.:Pour clean water.")) {
 			case 1:
-				set .@w_point,.@w_point+1;
+				set @w_point,@w_point + 1;
 				mes "[Darwin]";
 				mes "Huh?";
 				mes "What are you doing?";
 				next;
 				break;
 			case 2:
-				set .@w_point,.@w_point+1;
+				set @w_point,@w_point + 1;
 				mes "[Darwin]";
 				mes "W-wait...";
 				mes "Are you";
@@ -1198,11 +1688,11 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 			case 3:
 				break;
 			}
-			switch(select("Continue crushing the Herbs.:Continue eating the Herbs.:Continue dancing and singing.")) {
+			switch (select("Continue crushing the Herbs.:Continue eating the Herbs.:Continue dancing and singing.")) {
 			case 1:
 				break;
 			case 2:
-				set .@w_point,.@w_point+1;
+				set @w_point,@w_point + 1;
 				mes "[Darwin]";
 				mes "Eat the Herbs?";
 				mes "I think you need";
@@ -1211,7 +1701,7 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 				next;
 				break;
 			case 3:
-				set .@w_point,.@w_point+1;
+				set @w_point,@w_point + 1;
 				mes "[Darwin]";
 				mes "Singing and";
 				mes "dancing? Alchemists";
@@ -1220,9 +1710,9 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 				next;
 				break;
 			}
-			switch(select("Put noodles in and fry it.:Pour it in an empty bottle.:Hold the Medicine Bowl and drink it.")) {
+			switch (select("Put noodles in and fry it.:Pour it in an empty bottle.:Hold the Medicine Bowl and drink it.")) {
 			case 1:
-				set .@w_point,.@w_point+1;
+				set @w_point,@w_point + 1;
 				mes "[Darwin]";
 				mes "We're Alchemists,";
 				mes "not restaurant chefs.";
@@ -1231,14 +1721,14 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 			case 2:
 				break;
 			case 3:
-				set .@w_point,.@w_point+1;
+				set @w_point,@w_point + 1;
 				mes "[Darwin]";
 				mes "Huh...";
 				mes "Pretty sloppy...";
 				next;
 				break;
 			}
-			if (.@w_point > 0) {
+			if (@w_point > 0) {
 				mes "[Darwin]";
 				mes "...";
 				mes "......";
@@ -1255,7 +1745,7 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 			mes "[Darwin]";
 			mes "Good job.";
 			mes "It came out pretty well considering it's your first time. Go ahead and keep the medicines that you've just made.";
-			set ALCH_Q,8;
+			set ALCMST_Q,8;
 			changequest 2033,2035;
 			next;
 			mes "[Darwin]";
@@ -1269,29 +1759,28 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 			mes "what is most precious to you.";
 			close;
 		}
-		else {
-			mes "[Darwin]";
-			mes "Have you forgotten";
-			mes "what you need to bring?";
-			mes "Let me remind you once";
-			mes "again. You must come";
-			mes "back with...";
-			next;
-			mes "[Darwin]";
-			mes "^551A8B3 Medicine Bowls^000000,";
-			mes "^551A8B3 Empty Bottle^000000,";
-			mes "^551A8B1 Red Herb^000000,";
-			mes "^551A8B1 Yellow Herb^000000 and";
-			mes "^551A8B1 White Herb^000000.";
-			next;
-			mes "[Darwin]";
-			mes "Come back";
-			mes "when you are";
-			mes "ready...";
-			close;
-		}
+		mes "[Darwin]";
+		mes "Have you forgotten";
+		mes "what you need to bring?";
+		mes "Let me remind you once";
+		mes "again. You must come";
+		mes "back with...";
+		next;
+		mes "[Darwin]";
+		mes "^551A8B3 Medicine Bowls^000000,";
+		mes "^551A8B3 Empty Bottle^000000,";
+		mes "^551A8B1 Red Herb^000000,";
+		mes "^551A8B1 Yellow Herb^000000 and";
+		mes "^551A8B1 White Herb^000000.";
+		next;
+		mes "[Darwin]";
+		mes "Come back";
+		mes "when you are";
+		mes "ready...";
+		close;
 	}
-	else if (ALCH_Q == 8) {
+	if (ALCMST_Q == 8) {
+		mes "[Darwin]";
 		mes "I said to go";
 		mes "to Van Helmont.";
 		mes "I'd like to teach you";
@@ -1304,7 +1793,8 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 		mes "withers as well..";
 		close;
 	}
-	else if (ALCH_Q == 40) {
+	if (ALCMST_Q == 40) {
+		mes "[Darwin]";
 		mes "I have already given you all of my knowledge and have nothing more";
 		mes "to teach you.";
 		next;
@@ -1313,32 +1803,31 @@ alde_alche,13,15,7	script	Studying Man#am	750,{
 		mes "you do that, your life as an Alchemist will begin.";
 		close;
 	}
-	else {
-		mes "When you have";
-		mes "your dreams, you";
-		mes "have everything.";
-		mes "Without them, you have";
-		mes "nothing more to lose.";
-		next;
-		mes "[Darwin]";
-		mes "These cursed eyes...";
-		mes "They've lost sight of";
-		mes "my dreams a long time ago.";
-		mes "Ha ha ha ha...";
-		next;
-		mes "[Darwin]";
-		mes "Does paradise";
-		mes "really exist...?";
-		mes "Not without my love...";
-		mes "Not without Harmona...";
-		close;
-	}
+	mes "[Darwin]";
+	mes "When you have";
+	mes "your dreams, you";
+	mes "have everything.";
+	mes "Without them, you have";
+	mes "nothing more to lose.";
+	next;
+	mes "[Darwin]";
+	mes "These cursed eyes...";
+	mes "They've lost sight of";
+	mes "my dreams a long time ago.";
+	mes "Ha ha ha ha...";
+	next;
+	mes "[Darwin]";
+	mes "Does paradise";
+	mes "really exist...?";
+	mes "Not without my love...";
+	mes "Not without Harmona...";
+	close;
 }
 
-alde_alche,79,19,5	script	Experiment Expert#am	748,{
-	mes "[Van Helmont]";
-	if (BaseJob != Job_Merchant) {
-		if (BaseJob == Job_Alchemist) {
+alde_alche,79,19,5	script	Experiment Expert	748,{
+	if ((Class != Job_Baby_Merchant) && (Class != Job_Merchant)) {
+		if (Class == Job_Baby_Alchemist || Class == Job_Alchemist) {
+			mes "[Van Helmont]";
 			mes "What do you want?";
 			mes "I'm busy!! Don't";
 			mes "bother me and get";
@@ -1353,25 +1842,25 @@ alde_alche,79,19,5	script	Experiment Expert#am	748,{
 			mes "Reading science journals and performing experiments. That's what Alchemy is all about. Now, let me get back to work!";
 			close;
 		}
-		else {
-			mes "Just a little...";
-			mes "A little bit more...";
-			mes "Nooo! Just a little";
-			mes "bit more and it";
-			mes "would've been done!";
-			next;
-			mes "[Van Helmont]";
-			mes "Why...?!";
-			mes "Why, another failure?!";
-			mes "My calculations were";
-			mes "all correct! W-Wait...!";
-			next;
-			mes "[Van Helmont]";
-			mes "Perhaps, if I capacitated the thermal flux by using the neutronic gradient, it just might work...!";
-			close;
-		}
+		mes "[Van Helmont]";
+		mes "Just a little...";
+		mes "A little bit more...";
+		mes "Nooo! Just a little";
+		mes "bit more and it";
+		mes "would've been done!";
+		next;
+		mes "[Van Helmont]";
+		mes "Why...?!";
+		mes "Why, another failure?!";
+		mes "My calculations were";
+		mes "all correct! W-Wait...!";
+		next;
+		mes "[Van Helmont]";
+		mes "Perhaps, if I capacitated the thermal flux by using the neutronic gradient, it just might work...!";
+		close;
 	}
-	if (ALCH_Q == 8) {
+	if (ALCMST_Q == 8) {
+		mes "[Van Helmont]";
 		mes "Arrrrgh...!";
 		mes "Why isn't this formula working? What's wrong? In theory, it's all correct, but there must be an error in the formula somewhere...";
 		next;
@@ -1393,7 +1882,20 @@ alde_alche,79,19,5	script	Experiment Expert#am	748,{
 		mes "Um...";
 		mes "Who are you?";
 		next;
-		if (select("I want to become an Alchemist.:.......") == 2) {
+		switch (select("I want to become an Alchemist.:.......")) {
+		case 1:
+			mes "[Van Helmont]";
+			mes "You...?";
+			mes "An Alchemist?";
+			mes "What a funny Merchant.";
+			next;
+			mes "[Van Helmont]";
+			mes "Well, that's nice, but I have very urgent experiments that require";
+			mes "my attention, so don't get";
+			mes "in the way.";
+			next;
+			break;
+		case 2:
 			mes "[Van Helmont]";
 			mes "Hmm...?";
 			mes "What, did you just want to watch? Fine, fine, but do it quietly and leave right when you're done.";
@@ -1402,17 +1904,8 @@ alde_alche,79,19,5	script	Experiment Expert#am	748,{
 			mes "Stay out of my way and don't go around touching stuff. There might be some volatile materials, so it'd be dangerous to have any accidents.";
 			close;
 		}
-		mes "[Van Helmont]";
-		mes "You...?";
-		mes "An Alchemist?";
-		mes "What a funny Merchant.";
-		next;
-		mes "[Van Helmont]";
-		mes "Well, that's nice, but I have very urgent experiments that require";
-		mes "my attention, so don't get";
-		mes "in the way.";
-		next;
-		if (select("Teach me something.:...") == 1) {
+		switch (select("Teach me something.:...")) {
+		case 1:
 			mes "[Van Helmont]";
 			mes "Argh...!";
 			mes "Didn't I just tell you not to bother me? What's so hard to understand about that?";
@@ -1432,39 +1925,41 @@ alde_alche,79,19,5	script	Experiment Expert#am	748,{
 			mes "You don't need to bring anything. Just go watch him at work and have him tell you how he makes those solutions. Got it?";
 			next;
 			mes "[Van Helmont]";
-			set ALCH_Q,9;
+			set ALCMST_Q,9;
 			changequest 2035,2036;
 			mes "Well then, see you later.";
 			mes "You'd better get going as";
 			mes "soon as you can.";
 			close;
+		case 2:
+			mes "[Van Helmont]";
+			mes "...";
+			next;
+			mes "[Van Helmont]";
+			mes "...";
+			mes "......";
+			next;
+			mes "[Van Helmont]";
+			mes "...";
+			mes "......";
+			next;
+			mes "[Van Helmont]";
+			mes "So if I recalibrate the combustion rate of this compound, that should negate any cohesive tendencies in this particle flux...";
+			next;
+			mes "[Van Helmont]";
+			mes "But what am I going to do";
+			mes "about all of this spontaneous";
+			mes "crystallization?! I can't very well remove this matrix, I need it for the catalyst to reach the triple point.";
+			next;
+			mes "[Van Helmont]";
+			mes "Damn!";
+			mes "What am";
+			mes "I going to do?!";
+			close;
 		}
-		mes "[Van Helmont]";
-		mes "...";
-		next;
-		mes "[Van Helmont]";
-		mes "...";
-		mes "......";
-		next;
-		mes "[Van Helmont]";
-		mes "...";
-		mes "......";
-		next;
-		mes "[Van Helmont]";
-		mes "So if I recalibrate the combustion rate of this compound, that should negate any cohesive tendencies in this particle flux...";
-		next;
-		mes "[Van Helmont]";
-		mes "But what am I going to do";
-		mes "about all of this spontaneous";
-		mes "crystallization?! I can't very well remove this matrix, I need it for the catalyst to reach the triple point.";
-		next;
-		mes "[Van Helmont]";
-		mes "Damn!";
-		mes "What am";
-		mes "I going to do?!";
-		close;
 	}
-	else if (ALCH_Q == 9) {
+	if (ALCMST_Q == 9) {
+		mes "[Van Helmont]";
 		mes "Alright, if I make an incision here in the Tentacle, and add a Jellopy and Sticky Mucus solution into the... Where the hell did my Medicine Bowl go?";
 		next;
 		mes "[Van Helmont]";
@@ -1478,7 +1973,19 @@ alde_alche,79,19,5	script	Experiment Expert#am	748,{
 		mes "......";
 		mes "Who are you?";
 		next;
-		if (select("I want to become an Alchemist?:.......") == 2) {
+		switch (select("I want to become an Alchemist?:.......")) {
+		case 1:
+			mes "[Van Helmont]";
+			mes "Ah, of course. The Merchant from before. So what did you learn from Molgenstein? I didn't just send you there for fun, you know.";
+			next;
+			mes "[Van Helmont]";
+			mes "Let me ask you";
+			mes "some questions to";
+			mes "check what you've";
+			mes "learned.";
+			next;
+			break;
+		case 2:
 			mes "[Van Helmont]";
 			mes "Hmm...?";
 			mes "What, did you just want to watch? Fine, fine, but do it quietly and leave right when you're done.";
@@ -1487,29 +1994,39 @@ alde_alche,79,19,5	script	Experiment Expert#am	748,{
 			mes "Stay out of my way and don't go around touching stuff. There might be some volatile materials, so it'd be dangerous to have any accidents.";
 			close;
 		}
-		mes "[Van Helmont]";
-		mes "Ah, of course. The Merchant from before. So what did you learn from Molgenstein? I didn't just send you there for fun, you know.";
-		next;
-		mes "[Van Helmont]";
-		mes "Let me ask you";
-		mes "some questions to";
-		mes "check what you've";
-		mes "learned.";
-		next;
-		if(MISC_QUEST & 4) {
+		set @w_point,0;
+		if (molgenstain == 3) {
 			mes "[Van Helmont]";
 			mes "Which item is not";
 			mes "necessary to make";
 			mes "a Counteragent?";
 			next;
-			if (select("Karvodailnirol:Detrimindexta:Alcohol") != 1) set .@w_point,.@w_point+1;
+			switch (select("Karvodailnirol:Detrimindexta:Alcohol")) {
+			case 1:
+				break;
+			case 2:
+				set @w_point,@w_point + 1;
+				break;
+			case 3:
+				set @w_point,@w_point + 1;
+				break;
+			}
 			mes "[Van Helmont]";
 			mes "What item is not";
 			mes "necessary to make";
 			mes "a Mixture?";
 			next;
-			if (select("Karvodailnirol:Detrimindexta:Alcohol") != 2) set .@w_point,.@w_point+1;
-			if (.@w_point > 0) {
+			switch (select("Karvodailnirol:Detrimindexta:Alcohol")) {
+			case 1:
+				set @w_point,@w_point + 1;
+				break;
+			case 2:
+				break;
+			case 3:
+				set @w_point,@w_point + 1;
+				break;
+			}
+			if (@w_point > 0) {
 				mes "[Van Helmont]";
 				mes "Weren't you listening to Molgenstein at all? Maybe you";
 				mes "have to watch him make it again.";
@@ -1527,7 +2044,7 @@ alde_alche,79,19,5	script	Experiment Expert#am	748,{
 			mes "Go out and find the room next";
 			mes "to this one and talk to Nicholas. He'll continue your training.";
 			next;
-			set ALCH_Q,20;
+			set ALCMST_Q,20;
 			changequest 2036,2037;
 			mes "[Van Helmont]";
 			mes "What are you";
@@ -1543,13 +2060,33 @@ alde_alche,79,19,5	script	Experiment Expert#am	748,{
 			mes "you need to make";
 			mes "a Counteragent?";
 			next;
-			select("Feather:Sticky Mucus:Animal Gore");
+			switch (select("Feather:Sticky Mucus:Animal Gore")) {
+			case 1:
+				set @w_point,@w_point + 1;
+				break;
+			case 2:
+				set @w_point,@w_point + 1;
+				break;
+			case 3:
+				set @w_point,@w_point + 1;
+				break;
+			}
 			mes "[Van Helmont]";
 			mes "What item do";
 			mes "you need to make";
 			mes "a Mixture?";
 			next;
-			select("Monster Feed:Ancient Lips:Rotten Bandage");
+			switch (select("Monster Feed:Ancient Lips:Rotten Bandage")) {
+			case 1:
+				set @w_point,@w_point + 1;
+				break;
+			case 2:
+				set @w_point,@w_point + 1;
+				break;
+			case 3:
+				set @w_point,@w_point + 1;
+				break;
+			}
 			mes "[Van Helmont]";
 			mes "Be honest. You don't know, do you?! Didn't I say to go to Molgenstein and have him teach you?!";
 			next;
@@ -1558,7 +2095,8 @@ alde_alche,79,19,5	script	Experiment Expert#am	748,{
 			close;
 		}
 	}
-	else if (ALCH_Q == 20) {
+	if (ALCMST_Q == 20) {
+		mes "[Van Helmont]";
 		mes "What...?";
 		mes "I thought I told you to";
 		mes "talk to Nicholas next door?";
@@ -1568,29 +2106,28 @@ alde_alche,79,19,5	script	Experiment Expert#am	748,{
 		mes "and you need to finish becoming an Alchemist. Come on, get moving!";
 		close;
 	}
-	else {
-		mes "Just a little...";
-		mes "A little bit more...";
-		mes "Nooo! Just a little";
-		mes "bit more and it";
-		mes "would've been done!";
-		next;
-		mes "[Van Helmont]";
-		mes "Why...?!";
-		mes "Why, another failure?!";
-		mes "My calculations were";
-		mes "all correct! Wait...";
-		next;
-		mes "[Van Helmont]";
-		mes "Perhaps, if I capacitated the thermal flux by using the neutronic gradient, it just might work...";
-		close;
-	}
+	mes "[Van Helmont]";
+	mes "Just a little...";
+	mes "A little bit more...";
+	mes "Nooo! Just a little";
+	mes "bit more and it";
+	mes "would've been done!";
+	next;
+	mes "[Van Helmont]";
+	mes "Why...?!";
+	mes "Why, another failure?!";
+	mes "My calculations were";
+	mes "all correct! Wait...";
+	next;
+	mes "[Van Helmont]";
+	mes "Perhaps, if I capacitated the thermal flux by using the neutronic gradient, it just might work...";
+	close;
 }
 
-alde_alche,101,184,4	script	Master Alchemist#am	122,{
+alde_alche,101,184,4	script	Master Alchemist	122,{
 	cutin "job_alche_vincent",2;
-	mes "[Vincent Carsciallo]";
 	if (Upper == 1) {
+		mes "[Vincent Carsciallo]";
 		mes "You have transcended...";
 		mes "Excellent, excellent.";
 		next;
@@ -1601,8 +2138,9 @@ alde_alche,101,184,4	script	Master Alchemist#am	122,{
 		cutin "",255;
 		end;
 	}
-	if (BaseJob != Job_Merchant) {
-		if (BaseJob == Job_Alchemist) {
+	if ((Class != Job_Baby_Merchant) && (Class != Job_Merchant)) {
+		if (Class == Job_Baby_Alchemist || Class == Job_Alchemist) {
+			mes "[Vincent Carsciallo]";
 			mes "Welcome!";
 			mes "So how is your";
 			mes "research coming along?";
@@ -1613,8 +2151,12 @@ alde_alche,101,184,4	script	Master Alchemist#am	122,{
 			mes "[Vincent Carsciallo]";
 			mes "If you discover something new,";
 			mes "come and tell us. Don't forget that we are all working together to unlock the mysteries of science!";
+			close2;
+			cutin "",255;
+			end;
 		}
-		else if (BaseClass == Job_Novice) {
+		if (Class == Job_Baby || Class == Job_Novice) {
+			mes "[Vincent Carsciallo]";
 			mes "Hm...";
 			mes "A Novice?";
 			mes "You shouldn't be";
@@ -1624,24 +2166,27 @@ alde_alche,101,184,4	script	Master Alchemist#am	122,{
 			mes "[Vincent Carsciallo]";
 			mes "There are a lot of volatile chemicals and dangerous";
 			mes "materials in this building. It'd be a lot better if you just played outside.";
+			close2;
+			cutin "",255;
+			end;
 		}
-		else {
-			mes "Hmm...?";
-			mes "What's an adventurer";
-			mes "doing here in the";
-			mes "Alchemist Union?";
-			next;
-			mes "[Vincent Carsciallo]";
-			mes "I'm afraid there's";
-			mes "not much we can offer";
-			mes "you here if you're not";
-			mes "a member of our Union.";
-		}
+		mes "[Vincent Carsciallo]";
+		mes "Hmm...?";
+		mes "What's an adventurer";
+		mes "doing here in the";
+		mes "Alchemist Union?";
+		next;
+		mes "[Vincent Carsciallo]";
+		mes "I'm afraid there's";
+		mes "not much we can offer";
+		mes "you here if you're not";
+		mes "a member of our Union.";
 		close2;
 		cutin "",255;
 		end;
 	}
-	if (ALCH_Q == 0) {
+	if (ALCMST_Q == 0) {
+		mes "[Vincent Carsciallo]";
 		mes "Hmm...?";
 		mes "A Merchant?";
 		mes "Are you interested";
@@ -1661,16 +2206,18 @@ alde_alche,101,184,4	script	Master Alchemist#am	122,{
 		cutin "",255;
 		end;
 	}
-	else if (ALCH_Q == 40) {
+	if (ALCMST_Q == 40) {
 		if (JobLevel < 40) {
-			set ALCH_Q,0;
+			set ALCMST_Q,0;
+			mes "[Vincent Carsciallo]";
 			mes "Hmm...you don't seem to be qualified yet.";
 			mes "Remember, you must reach at least job level 40 to become an Alchemist.";
 			close2;
 			cutin "",255;
 			end;
 		}
-		if (SkillPoint) {
+		if (SkillPoint != 0) {
+			mes "[Vincent Carsciallo]";
 			mes "Ah, you're almost";
 			mes "ready to become an";
 			mes "Alchemist, but you must";
@@ -1686,27 +2233,28 @@ alde_alche,101,184,4	script	Master Alchemist#am	122,{
 			cutin "",255;
 			end;
 		}
-		if(checkquest(2039) != -1) {
-			changequest 2039,2040;
-		}
+		mes "[Vincent Carsciallo]";
 		mes "Ah, well done.";
 		mes "I can see that you";
 		mes "have learned all of";
 		mes "the basics of Alchemy.";
 		next;
-		set ALCH_Q,0;
-		completequest 2040;
-		set .@jlevel,JobLevel;
-		callfunc "Job_Change",Job_Alchemist;
-		callfunc "F_ClearJobVar";
-		mes "[Vincent Carsciallo]";
-		mes "Henceforth, you are";
-		mes "now a member of our";
-		mes "illustrious Union.";
-		mes "I hope you learn a lot...";
-		next;
-
-		if (.@jlevel == 50) {
+		if (JobLevel == 50) {
+			set ALCMST_Q,0;
+			changequest 2034,2040;
+			changequest 2039,2040;
+			completequest 2040;
+			if(Class == Job_Baby_Merchant){
+				jobchange Job_Baby_Alchemist;
+			} else {
+				jobchange Job_Alchemist;
+			}
+			mes "[Vincent Carsciallo]";
+			mes "Henceforth, you are";
+			mes "now a member of our";
+			mes "illustrious Union.";
+			mes "I hope you learn a lot...";
+			next;
 			getitem 7133,1; //Slim_Potion_Create_Book
 			mes "[Vincent Carsciallo]";
 			mes "Let me give you";
@@ -1714,34 +2262,57 @@ alde_alche,101,184,4	script	Master Alchemist#am	122,{
 			mes "You can use this to";
 			mes "begin your life";
 			mes "of research.";
+			next;
+			mes "[Vincent Carsciallo]";
+			mes "I'll see";
+			mes "you later then...";
+			mes "Remember to carry";
+			mes "yourself with pride";
+			mes "as an Alchemist!";
+			close2;
+			cutin "",255;
+			end;
+		}
+		set ALCMST_Q,0;
+		changequest 2034,2040;
+		changequest 2039,2040;
+		completequest 2040;
+		if(Class == Job_Baby_Merchant){
+			jobchange Job_Baby_Alchemist;
+		} else {
+			jobchange Job_Alchemist;
+		}
+		mes "[Vincent Carsciallo]";
+		mes "Henceforth, you are";
+		mes "now a member of our";
+		mes "illustrious Union.";
+		mes "I hope you learn a lot...";
+		next;
+		set .@alche_m2, rand(1,6);
+		if (.@alche_m2 == 1) {
+			getitem 7127,1; //Alcol_Create_Book
+		}
+		else if (.@alche_m2 == 2) {
+			getitem 7128,1; //FireBottle_Create_Book
+		}
+		else if (.@alche_m2 == 3) {
+			getitem 7129,1; //Acid_Create_Book
+		}
+		else if (.@alche_m2 == 4) {
+			getitem 7130,1; //Plant_Create_Book
+		}
+		else if (.@alche_m2 == 5) {
+			getitem 7131,1; //Mine_Create_Book
 		}
 		else {
-			switch(rand(1,6)) {
-			case 1:
-				getitem 7127,1; //Alcol_Create_Book
-				break;
-			case 2:
-				getitem 7128,1; //FireBottle_Create_Book
-				break;
-			case 3:
-				getitem 7129,1; //Acid_Create_Book
-				break;
-			case 4:
-				getitem 7130,1; //Plant_Create_Book
-				break;
-			case 5:
-				getitem 7131,1; //Mine_Create_Book
-				break;
-			case 6:
-				getitem 7144,1; //Normal_Potion_Book
-			}
-			mes "[Vincent Carsciallo]";
-			mes "And...";
-			mes "Here's a little";
-			mes "something to help";
-			mes "you begin your";
-			mes "research.";
+			getitem 7144,1; //Normal_Potion_Book
 		}
+		mes "[Vincent Carsciallo]";
+		mes "And...";
+		mes "Here's a little";
+		mes "something to help";
+		mes "you begin your";
+		mes "research.";
 		next;
 		mes "[Vincent Carsciallo]";
 		mes "I'll see";
@@ -1753,24 +2324,23 @@ alde_alche,101,184,4	script	Master Alchemist#am	122,{
 		cutin "",255;
 		end;
 	}
-	else {
-		mes "Ah...";
-		mes "I believe you've";
-		mes "already registered";
-		mes "for training to become";
-		mes "an Alchemist.";
-		next;
-		mes "[Vincent Carsciallo]";
-		mes "Please listen to the";
-		mes "other Alchemists and follow their instructions carefully. You will learn much from them.";
-		close2;
-		cutin "",255;
-		end;
-	}
+	mes "[Vincent Carsciallo]";
+	mes "Ah...";
+	mes "I believe you've";
+	mes "already registered";
+	mes "for training to become";
+	mes "an Alchemist.";
+	next;
+	mes "[Vincent Carsciallo]";
+	mes "Please listen to the";
+	mes "other Alchemists and follow their instructions carefully. You will learn much from them.";
+	close2;
+	cutin "",255;
+	end;
 }
 
-alde_alche,145,19,1	script	Chief Researcher#am	57,{
-	if (checkweight(1201,1) == 0) {
+alde_alche,145,19,1	script	Chief Researcher	57,{
+	if (checkweight(1201,3) == 0) {
 		mes "- Wait a minute! -";
 		mes "- Currently you are carrying -";
 		mes "- too many items with you. -";
@@ -1778,8 +2348,8 @@ alde_alche,145,19,1	script	Chief Researcher#am	57,{
 		mes "- after you store some items into kafra storage. -";
 		close;
 	}
-	if (ALCH_Q > 19 && ALCH_Q < 22) {
-		if (ALCH_Q == 20) {
+	if ((ALCMST_Q > 19) && (ALCMST_Q < 22)) {
+		if (ALCMST_Q == 20) {
 			mes "[Nicholas Flamel]";
 			mes "Ooh...";
 			mes "You're the upstart";
@@ -1806,55 +2376,201 @@ alde_alche,145,19,1	script	Chief Researcher#am	57,{
 		mes "choose the word";
 		mes "that is ^551A8BIN^000000 the puzzle.";
 		next;
-		switch(rand(1,3)) {
-		case 1:
+		set .@alche_puz, rand(1,3);
+		if (.@alche_puz == 1) {
 			mes "t m y a n y e o b n e g p r i";
 			next;
-			if (select("Brake:Brass:Bug:Broken:Brigan?") == 5) set .@alch_t,.@alch_t+10;
-			mes "o n c u t a p j l e r s v m u";
+			set @alch_q, 0;
+			switch (select("Brake:Brass:Bug:Broken:Brigan?")) {
+			case 1:
+				break;
+			case 2:
+				break;
+			case 3:
+				break;
+			case 4:
+				break;
+			case 5:
+				set @alch_q, @alch_q + 10;
+				break;
+			}
+			mes "o n c u d a p j l e r s v m u";
 			next;
-			if (select("vendor:storage:weapon:simple:streetshop") == 1) set .@alch_t,.@alch_t+10;
+			switch (select("vendor:storage:weapon:simple:streetshop")) {
+			case 1:
+				set @alch_q, @alch_q + 10;
+				break;
+			case 2:
+				break;
+			case 3:
+				break;
+			case 4:
+				break;
+			case 5:
+				break;
+			}
 			mes "t v a r m e g p h e u b o y l";
 			next;
-			if (select("molasses:party:leader:sweets:treacle") == 2) set .@alch_t,.@alch_t+10;
+			switch (select("molasses:party:leader:sweets:treacle")) {
+			case 1:
+				break;
+			case 2:
+				set @alch_q, @alch_q + 10;
+				break;
+			case 3:
+				break;
+			case 4:
+				break;
+			case 5:
+				break;
+			}
 			mes "q z a h n a i n b r d p t n c";
 			next;
-			if (select("partisan:partizan:pato:paros:pack") == 2) set .@alch_t,.@alch_t+10;
-			break;
-		case 2:
+			switch (select("partisan:partizan:pato:paros:pack")) {
+			case 1:
+				break;
+			case 2:
+				set @alch_q, @alch_q + 10;
+				break;
+			case 3:
+				break;
+			case 4:
+				break;
+			case 5:
+				break;
+			}
+		}
+		else if (.@alche_puz == 2) {
 			mes "m p d i c f a r o g n k w a s";
 			next;
-			if (select("packman:sunshine:ragnarok:wonderland:frost") == 1) set .@alch_t,.@alch_t+10;
+			set @alch_q, 0;
+			switch (select("packman:sunshine:ragnarok:wonderland:frost")) {
+			case 1:
+				set @alch_q, @alch_q + 10;
+				break;
+			case 2:
+				break;
+			case 3:
+				break;
+			case 4:
+				break;
+			case 5:
+				break;
+			}
 			mes "g b n o p r e f a r e t a s k";
 			next;
-			if (select("purple:smoker:ragnarok:bolt:burnt wood") == 3) set .@alch_t,.@alch_t+10;
+			switch (select("purple:smoker:ragnarok:bolt:burnt wood")) {
+			case 1:
+				break;
+			case 2:
+				break;
+			case 3:
+				set @alch_q, @alch_q + 10;
+				break;
+			case 4:
+				break;
+			case 5:
+				break;
+			}
 			mes "u g n i s j e k c e o g n d p";
 			next;
-			if (select("scab:kinship:donate:source:opening") == 5) set .@alch_t,.@alch_t+10;
+			switch (select("scab:kinship:donate:source:opening")) {
+			case 1:
+				break;
+			case 2:
+				break;
+			case 3:
+				break;
+			case 4:
+				break;
+			case 5:
+				set @alch_q, @alch_q + 10;
+				break;
+			}
 			mes "r o e h n r o m c a i n p t t";
 			next;
-			if (select("forgemerchant:potionmerchant:dcmerchant:vendingmerchant:battlemerchant") == 2) set .@alch_t,.@alch_t+10;
-			break;
-		case 3:
+			switch (select("forgemerchant:potionmerchant:dcmerchant:vendingmerchant:battlemerchant")) {
+			case 1:
+				break;
+			case 2:
+				set @alch_q, @alch_q + 10;
+				break;
+			case 3:
+				break;
+			case 4:
+				break;
+			case 5:
+				break;
+			}
+		}
+		else {
 			mes "s m i e x b w u n e t a g l r";
 			next;
-			if (select("tiger:wolf:pumpkin:tripped:tore") == 1) set .@alch_t,.@alch_t+10;
+			set @alch_q, 0;
+			switch (select("tiger:wolf:pumpkin:tripped:tore")) {
+			case 1:
+				set @alch_q, @alch_q + 10;
+				break;
+			case 2:
+				break;
+			case 3:
+				break;
+			case 4:
+				break;
+			case 5:
+				break;
+			}
 			mes "n i e g b o p d s o a u w r v";
 			next;
-			if (select("bash:provoke:endure:stun:abracadabra") == 3) set .@alch_t,.@alch_t+10;
+			switch (select("bash:provoke:endure:stun:abracadabra")) {
+			case 1:
+				break;
+			case 2:
+				break;
+			case 3:
+				set @alch_q, @alch_q + 10;
+				break;
+			case 4:
+				break;
+			case 5:
+				break;
+			}
 			mes "l r m g r e x t a v i n e d e";
 			next;
-			if (select("alberta:latifoliate:crimson:maple:evergreen") == 5) set .@alch_t,.@alch_t+10;
+			switch (select("alberta:latifoliate:crimson:maple:evergreen")) {
+			case 1:
+				break;
+			case 2:
+				break;
+			case 3:
+				break;
+			case 4:
+				break;
+			case 5:
+				set @alch_q, @alch_q + 10;
+				break;
+			}
 			mes "r o e h n r o m c a i n p t t";
 			next;
-			if (select("forgemerchant:potionmerchant:dcmerchant:vendingmerchant:battlemerchant") == 2) set .@alch_t,.@alch_t+10;
-			break;
+			switch (select("forgemerchant:potionmerchant:dcmerchant:vendingmerchant:battlemerchant")) {
+			case 1:
+				break;
+			case 2:
+				set @alch_q, @alch_q + 10;
+				break;
+			case 3:
+				break;
+			case 4:
+				break;
+			case 5:
+				break;
+			}
 		}
 		mes "[Nicholas Flamel]";
 		mes "Ah, you finished.";
 		mes "Now, let's see...";
-		if (.@alch_t > 30) {
-			set ALCH_Q,22;
+		if (@alch_q > 30) {
+			set ALCMST_Q,22;
 			mes "Excellent job!";
 			next;
 			mes "[Nicholas Flamel]";
@@ -1871,27 +2587,23 @@ alde_alche,145,19,1	script	Chief Researcher#am	57,{
 			mes "^551A8Bplenty of room in your inventory^000000.";
 			close;
 		}
-		else {
-			set ALCH_Q,21;
-			mes "^666666*Gasp!*^000000 H-horrible!";
-			next;
-			mes "[Nicholas Flamel]";
-			mes "Judging from these results, you obviously have a problem with concentrating.";
-			next;
-			mes "[Nicholas Flamel]";
-			mes "If you can't even solve these easy word puzzles, how can you keep track of your experiments and research?";
-			next;
-			mes "[Nicholas Flamel]";
-			mes "Why don't you relax";
-			mes "and rest a bit before";
-			mes "you take the test again?";
-			close;
-
-		}
+		set ALCMST_Q,21;
+		mes "^666666*Gasp!*^000000 H-horrible!";
+		next;
+		mes "[Nicholas Flamel]";
+		mes "Judging from these results, you obviously have a problem with concentrating.";
+		next;
+		mes "[Nicholas Flamel]";
+		mes "If you can't even solve these easy word puzzles, how can you keep track of your experiments and research?";
+		next;
+		mes "[Nicholas Flamel]";
+		mes "Why don't you relax";
+		mes "and rest a bit before";
+		mes "you take the test again?";
+		close;
 	}
-	else if (ALCH_Q == 22) {
-		set .@now_weight,MaxWeight-Weight;
-		if (.@now_weight < 1370) {
+	if (ALCMST_Q == 22) {
+		if ((MaxWeight - Weight) < 1370) {
 			mes "[Nicholas Flamel]";
 			mes "Whoa...";
 			mes "You're carrying too much stuff! First, put some of your things in Kafra Storage.";
@@ -1911,7 +2623,7 @@ alde_alche,145,19,1	script	Chief Researcher#am	57,{
 		mes "Come back here to me after you";
 		mes "help them out. They'll need all of these items to continue their experiments.";
 		next;
-		set ALCH_Q,23;
+		set ALCMST_Q,23;
 		changequest 2037,2038;
 		mes "[Nicholas Flamel]";
 		mes "1 Mixture,";
@@ -1932,7 +2644,7 @@ alde_alche,145,19,1	script	Chief Researcher#am	57,{
 		mes "one piece.";
 		close;
 	}
-	else if (ALCH_Q == 23) {
+	if (ALCMST_Q == 23) {
 		mes "[Nicholas Flamel]";
 		mes "Didn't I say to";
 		mes "go to Juno and help";
@@ -1940,8 +2652,8 @@ alde_alche,145,19,1	script	Chief Researcher#am	57,{
 		mes "their Alchemy research?";
 		close;
 	}
-	else if (ALCH_Q == 24) {
-		set ALCH_Q,40;
+	if (ALCMST_Q == 24) {
+		set ALCMST_Q,40;
 		changequest 2038,2039;
 		mes "[Nicholas Flamel]";
 		mes "Ah, you're back!";
@@ -1959,44 +2671,24 @@ alde_alche,145,19,1	script	Chief Researcher#am	57,{
 		mes "All you have to do now is speak to the Union Leader on the 2nd floor! Congratulations, you'll become an Alchemist very soon!";
 		close;
 	}
-	else if (ALCH_Q == 40 && BaseJob == Job_Merchant) {
+	if ((ALCMST_Q == 40) && (Class == Job_Baby_Merchant || Class == Job_Merchant)) {
 		mes "[Nicholas Flamel]";
 		mes "All you have to do now is speak to the Union Leader on the 2nd floor! Congratulations, you'll become an Alchemist very soon!";
 		close;
 	}
-	else {
-		mes "[Nicholas Flamel]";
-		mes "Lorem ipsum dolor sit amet,";
-		mes "consectetuer adipiscing elit.";
-		mes "Vivamus sem. Sed metus";
-		mes "lacus, viverra id, rutrum eget,";
-		mes "rhoncus sit amet, lectus.";
-		next;
-		mes "[Nicholas Flamel]";
-		mes "Suspendisse sit amet urna in";
-		mes "nisl fringilla faucibus. Nulla scelerisque eros...";
-		mes "^666666*Mumble Mumble*^000000";
-		close;
-	}
+	mes "[Nicholas Flamel]";
+	mes "Lorem ipsum dolor sit amet,";
+	mes "consectetuer adipiscing elit.";
+	mes "Vivamus sem. Sed metus";
+	mes "lacus, viverra id, rutrum eget,";
+	mes "rhoncus sit amet, lectus.";
+	next;
+	mes "[Nicholas Flamel]";
+	mes "Suspendisse sit amet urna in";
+	mes "nisl fringilla faucibus. Nulla scelerisque eros...";
+	mes "^666666*Mumble Mumble*^000000";
+	close;
 }
 
-//============================================================ 
-// Old changelog
-//============================================================ 
-//= v1.0 Working.
-//= npc/quests/counteragent_mixture.txt Also Needed
-//= npc/quests/quests_yuno.txt Also Needed [Darkchild]
-//= v1.1 Fixed some minor bugs.  Optimized some lines. Re-organized the script a bit. 
-//= Giving Parmry NPC, Hammer and Old Book now waves the 50000 fee. (based of mRO website)
-//= Having a joblvl of 50 allows you to skip Rasputin's test. (based of mRO website) [kobra_k88]
-//= 1.2 fixed a few typos (have to hunt more) [Lupus]
-//= 1.3 Added Baby Class Support [Lupus]
-//= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
-//= 1.6a fixed some wrong answers, thanks to zlider for info [Lupus]
-//= 2.0 Changed numbers to constants. [Vicious]
-//= 2.2 Got rid of 'al_morgen' var. Now uses (MISC_QUEST & 4) [Lupus]
-//= 2.3 Optimized, changed job numbers to constants. Fixed some spelling [Lupus]
-//= 2.4 Added alternative prizes according to JobLevel [Lupus]
-//= 2.4a Fixed 2 wrong answers in Rasputin's test [Lupus]
+alde_alche,19,171,0	warp	alche#3	1,1,aldebaran,68,56
+alde_alche,42,171,0	warp	alche#4	1,1,aldebaran,56,68
\ No newline at end of file