* Updated Geneticist, Warlock, and Sura job quests to their latest versions.

* Added a clearer example for party_even_share_bonus (tid:58005).
* Standardized job headers.

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

7 files changed, 954 insertions, 1537 deletions

diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt
index 1ebd0c66f..ccd880a1d 100644
--- a/npc/re/jobs/3-2/genetic.txt
+++ b/npc/re/jobs/3-2/genetic.txt
@@ -1,77 +1,76 @@
 //===== rAthena Script ======================================= 
-// Genetic Job Change Quest
+//= Genetic Job Quest
 //===== By: ================================================== 
-//= Masao
-//= Credits: Muad_Dib & Aeomin
+//= Muad_Dib, Aeomin
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= Job change Quest from Alchemist / Creator -> Genetic.
 //===== Additional Comments: ================================= 
-//= 1.0 First Version.
-//= 1.1 Fixed Scatter Stuff NPC's - [JayPee].
+//= 1.0 First Version. [Masao]
+//= 1.1 Fixed Scatter Stuff NPCs [JayPee].
 //= 1.2 Updated dialogue. Credits to Muad_Dib. [Joseph]
+//= 1.3 Updated script, optimized. [Euphy]
 //============================================================
 
 alde_alche,35,186,5	script	Alchemist Union Member	805,{
-	if ((BaseLevel == 99) && (JobLevel > 49)){
-		if (Class == Job_Alchemist || Class == Job_Creator || Job_Baby_Alchemist){
-			if (SkillPoint == 0){
-				if (job_gen == 0){
-					mes "[Alchemist Union Member]";
-					mes "Our Alchemist Union brings up many junior alchemists with various promotions and investigations.";
-					next;
-					mes "[Alchemist Union Member]";
-					mes "They have spread to all corners of Rune-Midgart and were active in many fields like sciences or special item production methods.";
-					next;
-					mes "[Alchemist Union Member]";
-					mes "We call the members of our new union ^3131FF'Geneticists'^000000.";
-					next;
-					mes "[Alchemist Union Member]";
-					mes "Geneticists are the ones who have reached their peak potential in the world of Alchemy. They are the ones who currently spearhead alchemy throughout all of Rune-Midgart.";
-					next;
-					mes "[Alchemist Union Member]";
-					mes "It looks like you are an expert in this field, how about meeting other geneticists?";
-					next;
-					mes "[Alchemist Union Member]";
-					mes "Not long ago there was a Geneticist who announced a sensational new life studying research.";
-					mes "You are very knowledgeable. Do you think you might understand her work?";
-					next;
+	mes "[Alchemist Union Member]";
+	if (BaseLevel > 98 && JobLevel > 49){
+		if (BaseJob == Job_Alchemist) {
+			if (SkillPoint != 0) {
+				mes "- You still have unused skill points. Come back when you have used all of them. -";
+				close;
+			}
+			if (job_gen == 0) {
+				mes "Our Alchemist Union brings up many junior alchemists with various promotions and investigations.";
+				next;
+				mes "[Alchemist Union Member]";
+				mes "They have spread to all corners of Rune-Midgart and were active in many fields like sciences or special item production methods.";
+				next;
+				mes "[Alchemist Union Member]";
+				mes "We call the members of our new union ^3131FF'Geneticists'^000000.";
+				next;
+				mes "[Alchemist Union Member]";
+				mes "Geneticists are the ones who have reached their peak potential in the world of Alchemy. They are the ones who currently spearhead alchemy throughout all of Rune-Midgart.";
+				next;
+				mes "[Alchemist Union Member]";
+				mes "It looks like you are an expert in this field, how about meeting other geneticists?";
+				next;
+				mes "[Alchemist Union Member]";
+				mes "Not long ago there was a Geneticist who announced a sensational new life studying research.";
+				mes "You are very knowledgeable. Do you think you might understand her work?";
+				next;
+				mes "[Alchemist Union Member]";
+				mes "Her study may help you gain the knowledge to help you make a Geneticist!";;
+				next;
+				mes "[Alchemist Union Member]";
+				mes "How's that sound? Do you want to meet a Geneticist?";
+				next;
+				switch(select("Of course, I want to meet a Geneticist.:I don't want to meet a Geneticist.")) {
+				case 1:
 					mes "[Alchemist Union Member]";
-					mes "Her study may help you gain the knowledge to help you make a Geneticist!";;
+					mes "Wise choice!";
+					mes "The infamous Geneticist 'Devries'.";
 					next;
 					mes "[Alchemist Union Member]";
-					mes "How's that sound? Do you want to meet a Geneticist?";
-					next;
-					if(select("Of course, I want to meet a Geneticist.:I don't want to meet a Geneticist.") == 1){
-						mes "[Alchemist Union Member]";
-						mes "Wise choice!";
-						mes "The infamous geneticist 'Devries'.";
-						next;
-						mes "[Alchemist Union Member]";
-						mes "You can find her in the Alchemy Lab at the western part of Lighthalzen. There is also another geneticist studying weaponry there, you might want to pay her a visit as well.";
-						set job_gen,1;
-						setquest 2215;
-						close;
-					}
+					mes "You can find her in the Alchemy Lab at the western part of Lighthalzen. There is also another Geneticist studying weaponry there, you might want to pay her a visit as well.";
+					set job_gen,1;
+					setquest 2215;
+					close;
+				case 2:
 					mes "[Alchemist Union Member]";
 					mes "Aren't you interested in the study of life?";
 					close;
 				}
-				mes "[Alchemist Union Member]";
-				mes "The infamous Geneticist is studying at the Alchemy Lab in the western part of Lighthalzen.";
-				mes "If you are interested, go meet with her.";
-				close;
 			}
-			mes "[Alchemist Union Member]";
-			mes "- You still have unused skill points. Come back when you have used all of them.";
+			mes "The infamous Geneticist is studying at the Alchemy Lab in the western part of Lighthalzen.";
+			mes "If you are interested, go meet with her.";
 			close;
 		}
 	}
-	mes "[Alchemist Union Member]";
 	mes "Our Alchemist Union brings up many junior alchemists with various promotions and investigations.";
 	next;
 	mes "[Alchemist Union Member]";
@@ -86,297 +85,310 @@ alde_alche,35,186,5	script	Alchemist Union Member	805,{
 }
 
 job3_gen01,25,58,3	script	Devries#gen	865,{
-	if (SkillPoint == 0){
-		if (job_gen == 1){
-			mes "[Devries]";
-			mes "Oh! The bloodsucking plant sample C is withering again.";
-			mes "Should I change the ingredient of the growth care?";
-			mes "Hey please cheer up soon!";
-			next;
-			mes "[Devries]";
-			mes "Oh? A stranger?";
-			mes "Your look tells me that you are doing Alchemy as well right?";
-			next;
-			mes "[Devries]";
-			mes "People say the number of alchemists is increasing nowadays though there aren't may who study this field properly!";
-			next;
-			mes "[Devries]";
-			mes "They're all too worried about saying things like, ''Look at my bomb damage!'' or ''isn't my homunculus prettier?''";
-			next;
-			mes "[Devries]";
-			mes "The Alchemist Union was saying they'd support the researchers but actually what you get from the studying is just 'Spores Which Can Be Easily Raised'!";
-			next;
-			mes "[Devries]";
-			mes "Thanks to that, there are spores everywhere in my lab! There are spores everywhere!";
-			next;
-			select("Why do you talk like that?");
-			mes "[Devries]";
-			mes "'Cause I'm from Rune-Midgart!";
-			mes "Have you ever been to Rune-Midgart? Everyone in Rune-Midgart speaks like this.";
-			next;
-			if(select("Impossible?!:I'm also from Rune-Midgart.") == 1){
-				mes "[Devries]";
-				mes "Impossible?";
-				mes "Do you come from a Rune-Midgart village?";
-				mes "My village is very big, everyone there speaks like this.";
-				next;
-			} else {
-				emotion e_lv;
-				mes "[Devries]";
-				mes "Really! That's why I felt some kind of familiar atmosphere around you.";
-				mes "Meeting a hometown person in Schwaltzvalt, it's my pleasure to meet you!";
-				next;
-			}
-			mes "- Thump!! -";
-			next;
-			emotion e_ag;
-			mes "[Devries]";
-			mes "Ughhhhh! That woman started again!";
-			next;
-			select("What's that sound?");
-			mes "[Devries]";
-			mes "That's the sound of an experiment being carried out by my roommate, Demi Calberine..";
-			mes "Demi's a fire shell technician so she's always noisy like that.";
-			next;
-			emotion e_sob;
-			mes "[Devries]";
-			mes "Look at that!";
-			mes "My spores and plants are all freaked out!";
-			mes "I can't do my work with those noisy sounds. It gives me so much stress!!";
-			next;
-			mes "- Munch Crunch -";
-			next;
-			mes "[Devries]";
-			mes "When I don't feel good, I savor Mr. Orlean's handmade cookies little by little.";
-			next;
-			mes "[Devries]";
-			mes "It's a high-quality cookie that I got from Prontera. When I get one bite, it seems like I'm floating to Asgard.";
-			mes "The softness of the sweet cookie drowns out the clashing sounds from Demi Calberine.";
-			next;
-			mes "[Devries]";
-			mes "Wanna try one?";
-			mes "Ah, I've eaten all of it.";
-			next;
+	if (SkillPoint != 0) {
+		mes "- You still have some unused skill points. -";
+		close;
+	}
+	if (job_gen == 1) {
+		mes "[Devries]";
+		mes "Oh! The bloodsucking plant sample C is withering again.";
+		mes "Should I change the ingredient of the growth care?";
+		mes "Hey please cheer up soon!";
+		next;
+		mes "[Devries]";
+		mes "Oh? A stranger?";
+		mes "Your look tells me that you are doing Alchemy as well right?";
+		next;
+		mes "[Devries]";
+		mes "People say the number of alchemists is increasing nowadays though there aren't may who study this field properly!";
+		next;
+		mes "[Devries]";
+		mes "They're all too worried about saying things like, ''Look at my bomb damage!'' or ''isn?t my homunculus prettier?''";
+		next;
+		mes "[Devries]";
+		mes "The Alchemist Union was saying they'd support the researchers but actually what you get from the studying is just 'Spores Which Can Be Easily Raised'!";
+		next;
+		mes "[Devries]";
+		mes "Thanks to that, there are spores everywhere in my lab! There are spores everywhere!";
+		next;
+		select("Why do you talk like that?");
+		mes "[Devries]";
+		mes "'Cause I'm from Rune-Midgart!";
+		mes "Have you ever been to Rune-Midgart? Everyone in Rune-Midgart speaks like this.";
+		next;
+		switch(select("Impossible?!:I'm also from Rune-Midgart.")) {
+		case 1:
 			mes "[Devries]";
-			mes "But it's okay! On the 2nd floor of my room, there are boxes of those!";
-			mes "I couldn't stop buying it all in bulk. Ho ho ho.";
-			next;
-			mes "- Zooooooooooooooooing -";
-			specialeffect EF_ENDURE;
-			next;
-			specialeffect EF_REPAIRWEAPON;
-			mes "- (Screeching Sounds)!!! -";
-			mes "- (Screeching)!!! -";
-			next;
-			specialeffect EF_CRASHEARTH;
-			mes "- Bump! Bump! Bump! -";
-			next;
+			mes "Impossible?";
+			mes "Do you come from a Rune-Midgart village?";
+			mes "My village is very big, everyone there speaks like this.";
+			break;
+		case 2:
+			emotion e_lv;
 			mes "[Devries]";
-			mes "..................";
-			next;
+			mes "Really! That's why I felt some kind of familiar atmosphere around you.";
+			mes "Meeting a hometown person in Schwaltzvalt, it's my pleasure to meet you!";
+			break;
+		}
+		next;
+		mes "- Thump!! -";
+		next;
+		emotion e_ag;
+		mes "[Devries]";
+		mes "Ughhhhh! That woman started again!";
+		next;
+		select("What's that sound?");
+		mes "[Devries]";
+		mes "That's the sound of an experiment being carried out by my roommate, Demi Calberine..";
+		mes "Demi's a fire shell technician so she's always noisy like that.";
+		next;
+		emotion e_sob;
+		mes "[Devries]";
+		mes "Look at that!";
+		mes "My spores and plants are all freaked out!";
+		mes "I can't do my work with those noisy sounds. It gives me so much stress!!";
+		next;
+		mes "- Munch Crunch -";
+		next;
+		mes "[Devries]";
+		mes "When I don't feel good, I savor Mr. Orlean's handmade cookies little by little.";
+		next;
+		mes "[Devries]";
+		mes "It's a high-quality cookie that I got from Prontera. When I get one bite, it seems like I'm floating to Asgard.";
+		mes "The softness of the sweet cookie drowns out the clashing sounds from Demi Calberine.";
+		next;
+		mes "[Devries]";
+		mes "Wanna try one?";
+		mes "Ah, I've eaten all of it.";
+		next;
+		mes "[Devries]";
+		mes "But it's okay! On the 2nd floor of my room, there are boxes of those!";
+		mes "I couldn't stop buying it all in bulk. Ho ho ho.";
+		next;
+		mes "- Zooooooooooooooooing -";
+		specialeffect EF_ENDURE;
+		next;
+		specialeffect EF_REPAIRWEAPON,AREA,"#from1to2gen";
+		mes "- (Screeching Sounds)!!! -";
+		mes "- (Screeching)!!! -";
+		next;
+		specialeffect EF_CRASHEARTH,AREA,"#from1to2gen";
+		mes "- Bump! Bump! Bump! -";
+		next;
+		mes "[Devries]";
+		mes "..................";
+		next;
+		mes "[Devries]";
+		mes "Yoooooooooooow";
+		mes "Yipeeeeeeeeee!!!";
+		next;
+		mes "[Devries]";
+		mes "Demiiiiiiiiiiiiiiiiiiiiiiii!!!";
+		mes "Demiiiiiiiiiiiiiiiiiiiii!!!";
+		next;
+		mes "- For now it seems that I -";
+		mes "- need to calm down Devries. -";
+		set job_gen,2;
+		close;
+	} else if (job_gen == 2) {
+		mes "[Devries]";
+		mes "Yipeeeeeeeeee!!!";
+		mes "Demiiiiii!!!";
+		mes "Demiiiiiiiii!!!";
+		next;
+		mes "- Hmm. -";
+		mes "- What'll make her calm? -";
+		close;
+	} else if (job_gen == 3) {
+		mes "[Devries]";
+		mes "Yipeeeeeeeeee!!!";
+		mes "Demiiiiii!!!";
+		mes "Demiiiiiiiii!!!";
+		next;
+		select("Hand Devries a cookie.");
+		mes "- Devries quickly snatches -";
+		mes "- away the cookie and stuffs -";
+		mes "- it all in her mouth. -";
+		next;
+		mes "- Crunch Crunch Crunch -";
+		mes "- Crunch Crunch Crunch -";
+		mes "- Crunch Crunch Crunch -";
+		next;
+		mes "[Devries]";
+		mes "Ah, The sweet buttery taste remains at the end of my tongue.";
+		mes "This really gives me peace of mind.";
+		next;
+		emotion e_pif;
+		mes "[Devries]";
+		mes "Demi is studying hard today as well";
+		mes "Huhuhu. She's really a hard worker.";
+		next;
+		mes "- That cookie changed her mood quick. -";
+		emotion e_no1,1;
+		next;
+		mes "[Devries]";
+		mes "You came here with a love for Alchemy?";
+		next;
+		mes "[Devries]";
+		mes "Oh wait, We haven't introduced ourselves yet.";
+		mes "My name is Devries.";
+		mes "I'm very interested in making living things that show new and peculiar growth.";
+		next;
+		mes "[Devries]";
+		mes "What's your name, young alchemist?";
+		next;
+		select("I'm "+strcharinfo(0)+".");
+		mes "[Devries]";
+		mes "Oh, "+strcharinfo(0)+"!";
+		mes "That's a very unusual name. Pleased to meet you.";
+		next;
+		mes "[Devries]";
+		mes "But I can't memorize the name well.";
+		mes "So I'll just call you <Popo>. Would that be ok?";
+		next;
+		select("I uhh...");
+		mes "[Devries]";
+		mes "Great...";
+		mes "Popo, have you heard of my research?";
+		mes "You came here because of that, am I right?";
+		next;
+		switch(select("No.:Yes.")) {
+		case 1:
 			mes "[Devries]";
-			mes "Yoooooooooooow";
-			mes "Yipeeeeeeeeee!!!";
-			next;
+			mes "Well, it's all over your face.";
+			mes "You don't have to be shy.";
+			break;
+		case 2:
 			mes "[Devries]";
-			mes "Demiiiiiiiiiiiiiiiiiiiiiiii!!!";
-			mes "Demiiiiiiiiiiiiiiiiiiiii!!!";
-			next;
-			mes "- For now it seems that I -";
-			mes "- need to calm down Devries. -";
-			set job_gen,2;
-			close;
-		}else if (job_gen == 2){
+			mes "That's right huh?";
+			mes "Well, as I expected, there really is something that makes homeland people get each other";
+			break;
+		}
+		next;
+		mes "[Devries]";
+		mes "When you saw me in that feverish state, you remembered what I said before and that calmed me down.";
+		next;
+		mes "[Devries]";
+		mes "I like the way you manage yourself and take care to remember small details.";
+		mes "You have the talent to become a Geneticist.";
+		next;
+		mes "[Devries]";
+		mes "^FF0000If you become a Geneticist, you can't take the Alchemist's or Biochemist study course that you haven't investigated before.^000000";
+		mes "If that's all right for you, how about giving it a shot right now?.";
+		next;
+		switch(select("I'll try later.:I want to become a Geneticist!")) {
+		case 1:
 			mes "[Devries]";
-			mes "Yipeeeeeeeeee!!!";
-			mes "Demiiiiii!!!";
-			mes "Demiiiiiiiii!!!";
-			next;
-			mes "- Hmm -";
-			mes "- What'll make her calm. -";
+			mes "Alright.";
+			mes "Even though your knowledge is not that great as that of Geneticists, a fundamental knowledge is also important.";
+			mes "Popo, come back to me once you've finished your studies.";
+			set job_gen,4;
 			close;
-		}else if (job_gen == 3){
-			mes "[Devries]";
-			mes "Yipeeeeeeeeee!!!";
-			mes "Demiiiiii!!!";
-			mes "Demiiiiiiiii!!!";
-			next;
-			select("Hand Devries a cookie.");
-			mes "- Devries quickly snatches -";
-			mes "- away the cookie and stuffs -";
-			mes "- it all in her mouth. -";
-			next;
-			mes "- Crunch Crunch Crunch -";
-			mes "- Crunch Crunch Crunch -";
-			mes "- Crunch Crunch Crunch -";
-			next;
-			mes "[Devries]";
-			mes "Ah, The sweet buttery taste remains at the end of my tongue.";
-			mes "This really gives me peace of mind.";
-			next;
-			emotion e_rice;
-			mes "[Devries]";
-			mes "Demi is studying hard today as well";
-			mes "Huhuhu. She's really a hard worker.";
-			next;
-			mes "- That cookie changed her mood quick. -";
-			emotion e_no1;
-			next;
-			mes "[Devries]";
-			mes "You came here with a love for Alchemy?";
-			next;
-			mes "[Devries]";
-			mes "Oh wait, We haven't introduced ourselves yet.";
-			mes "My name is Devries.";
-			mes "I'm very interested in making living things that show new and peculiar growth.";
-			next;
-			mes "[Devries]";
-			mes "What's your name, young alchemist?";
-			next;
-			select("I'm "+strcharinfo(0)+".");
-			mes "[Devries]";
-			mes "Oh, "+strcharinfo(0)+".";
-			mes "That's a very unusual name. Pleased to meet you.";
-			next;
-			mes "[Devries]";
-			mes "But I can't memorize the name well.";
-			mes "So I'll just call you <Popo>. Would that be ok?";
-			next;
-			select("I uhh..");
-			mes "[Devries]";
-			mes "Great...";
-			mes "Popo, have you heard of my research?";
-			mes "You came here because of that, am I right?";
-			next;
-			if(select("No.:Yes.") == 1){
-				mes "[Devries]";
-				mes "Well, it's all over your face.";
-				mes "You don't have to be shy.";
-			} else {
-				mes "[Devries]";
-				mes "That's right huh?";
-				mes "Well, as I expected, there really is something that makes homeland people get each other";
-			}
-			next;
-			mes "[Devries]";
-			mes "When you saw me in that feverish state, you remembered what I said before and that calmed me down.";
-			next;
-			mes "[Devries]";
-			mes "I like the way you manage yourself and take care to remember small details.";
-			mes "You have the talent to become a Geneticist.";
-			next;
-			mes "[Devries]";
-			mes "^FF0000If you become a Geneticist, you can't take the Alchemist's or Biochemist study course that you haven't investigated before.^000000";
-			mes "If that's all right for you, how about giving it a shot right now?.";
-			next;
-			if(select("I'll try later.:I want to become a Geneticist!") == 1){
-				mes "[Devries]";
-				mes "Alright.";
-				mes "Even though your knowledge is not that great as that of Geneticists, a fundamental knowledge is also important.";
-				mes "Popo, come back to me once you've finished your studies.";
-				set job_gen,4;
-				close;
-			}
+		case 2:
 			mes "[Devries]";
 			mes "Good!";
 			mes "Let's do it!";
 			set job_gen,5;
 			close;
-		}else if (job_gen == 4){
+		}
+	} else if (job_gen == 4) {
+		mes "[Devries]";
+		mes "Popo!";
+		mes "Are you ready to give it a shot?";
+		next;
+		switch(select("No.:Yes!")) {
+		case 1:
 			mes "[Devries]";
-			mes "Popo!";
-			mes "Are you ready to give it a shot?";
-			next;
-			if(select("No.:Yes!") == 1){
-				mes "[Devries]";
-				mes "You have to do your best! There is no easy way when looking for knowledge!";
-				close;
-			}
+			mes "You have to do your best! There is no easy way when looking for knowledge!";
+			close;
+		case 2:
 			mes "[Devries]";
 			mes "Very good!";
 			mes "Let's do it!";
 			set job_gen,5;
 			close;
-		}else if (job_gen == 5){
-			mes "[Devries]";
-			mes "What do you think of plants, Popo";
-			mes "Do you like plants? What kind of plants are you interested in?";
-			next;
-			mes "- Boom, Boom, Boom -";
-			next;
-			emotion e_swt2;
-			mes "[Devries]";
-			mes "Ah, please tell me Demi Calberine is not starting again?";
-			mes "Please let my expectation be wrong ... Please... Demi, please...";
-			next;
-			mes "[Devries]";
-			mes "Where did I stop talking";
-			mes "Oh, right. Plants are very important in Alchemy.";
-			next;
-			mes "[Devries]";
-			mes "Alchemy can make Flora's and Geographers grow immensely fast, so they can help in battle, like those Alchemists...";
-			next;
-			mes "- Boom!! Boom!! Boom!! Boom!! -";
-			next;
-			emotion e_hmm;
-			mes "[Devries]";
-			mes ".......................";
-			next;
-			emotion e_hmm;
-			mes "[Devries]";
-			mes "Techniques, plants are relatively easy to...";
-			next;
-			mes "- Boom!!!!!! -";
-			next;
-			emotion e_hmm;
-			mes "[Devries]";
-			mes "Crossbreed...";
-			next;
-			mes "- Pop!!!!!! -";
-			mes "- Keeeeeeeeeeeeeh!!!! -";
-			mes "- Boooooooooooooom!!!! -";
-			mes "- Boom!! Boom!! Boom!! -";
-			next;
-			emotion e_hmm;
-			mes "[Devries]";
-			mes ".......................";
-			next;
-			emotion e_hmm;
-			mes "[Devries]";
-			mes "Popo.";
-			next;
-			emotion e_hmm;
-			mes "[Devries]";
-			mes "I'll give you the test to become a Geneticist.";
-			next;
-			mes "[Devries]";
-			mes "The subject is <The Perfect Soundproof System>!";
-			mes "Please think of a way to save me from Demi Calberine's noise, using plants and experimental equipment that are here on the 1st floor of the lab.";
-			next;
-			mes "[Devries]";
-			mes "Well, you better get started!";
-			set job_gen,6;
-			close;
-		}else if (job_gen == 6){
-			mes "[Devries]";
-			mes "The subject is <The Perfect Soundproof System>!";
-			mes "Please think of a way to save me from Demi Calbereine's noise, using plants and experimental equipment that are here on the 1st floor of the lab.";
-			next;
+		}
+	} else if (job_gen == 5) {
+		mes "[Devries]";
+		mes "What do you think of plants, Popo";
+		mes "Do you like plants? What kind of plants are you interested in?";
+		next;
+		mes "- Boom, Boom, Boom -";
+		next;
+		emotion e_swt;
+		mes "[Devries]";
+		mes "Ah, please tell me Demi Calberine is not starting again?";
+		mes "Please let my expectation be wrong ... Please... Demi, please...";
+		next;
+		mes "[Devries]";
+		mes "Where did I stop talking";
+		mes "Oh, right. Plants are very important in Alchemy.";
+		next;
+		mes "[Devries]";
+		mes "Alchemy can make Flora's and Geographers grow immensely fast, so they can help in battle, like those Alchemists...";
+		next;
+		mes "- Boom!! Boom!! Boom!! Boom!! -";
+		next;
+		emotion e_dots;
+		mes "[Devries]";
+		mes ".......................";
+		next;
+		emotion e_dots;
+		mes "[Devries]";
+		mes "Techniques, plants are relatively easy to...";
+		next;
+		mes "- Boom!!!!!! -";
+		next;
+		emotion e_dots;
+		mes "[Devries]";
+		mes "Crossbreed...";
+		next;
+		mes "- Pop!!!!!! -";
+		mes "- Keeeeeeeeeeeeeh!!!! -";
+		mes "- Boooooooooooooom!!!! -";
+		mes "- Boom!! Boom!! Boom!! -";
+		next;
+		emotion e_dots;
+		mes "[Devries]";
+		mes ".......................";
+		next;
+		emotion e_dots;
+		mes "[Devries]";
+		mes "Popo.";
+		next;
+		emotion e_dots;
+		mes "[Devries]";
+		mes "I'll give you the test to become a Geneticist.";
+		next;
+		mes "[Devries]";
+		mes "The subject is <The Perfect Soundproof System>!";
+		mes "Please think of a way to save me from Demi Calberine's noise, using plants and experimental equipment that are here on the 1st floor of the lab.";
+		next;
+		mes "[Devries]";
+		mes "Well, you better get started!";
+		set job_gen,6;
+		close;
+	} else if (job_gen == 6) {
+		mes "[Devries]";
+		mes "The subject is <The Perfect Soundproof System>!";
+		mes "Please think of a way to save me from Demi Calbereine's noise, using plants and experimental equipment that are here on the 1st floor of the lab.";
+		next;
+		mes "[Devries]";
+		mes "There are some guides in the cabinet that you may use.";
+		mes "Well, you better get started!";
+		close;
+	} else if (job_gen > 6 && job_gen < 60) {
+		mes "[Devries]";
+		mes "Is there a problem?";
+		next;
+		switch(select("Nothing.:The experiment failed.")) {
+		case 1:
 			mes "[Devries]";
-			mes "There are some guides in the cabinet that you may use.";
-			mes "Well, you better get started!";
+			mes "Better get started, or I'll start to scream!!!";
 			close;
-		}else if ((job_gen > 6) && (job_gen < 60)){
-			mes "[Devries]";
-			mes "Is there a problem?";
-			next;
-			if(select("Nothing.:The experiment failed.") == 1){
-				mes "[Devries]";
-				mes "Better get started, or I'll start to scream!!!";
-				close;
-			}
+		case 2:
 			mes "[Devries]";
-			mes "Why not start over?";
+			mes "You can start from the beginning then?";
 			mes "Why are you asking me such things?";
 			set job_gen,7;
 			if (checkquest(2209) == 1) erasequest 2209;
@@ -386,33 +398,27 @@ job3_gen01,25,58,3	script	Devries#gen	865,{
 			if (checkquest(2213) == 1) erasequest 2213;
 			if (checkquest(2214) == 1) erasequest 2214;
 			close;
-		}else if (job_gen == 60 || job_gen == 61){
-			mes "- Zing Zing Zigi Zigi -";
-			next;
-			mes "- Zing Zing Zigi Zigi -";
-			next;
-			mes "[Devries]";
-			mes "What the hell is Demi Calberine doing?";
-			mes "That's really a noisy one.";
-			next;
+		}
+	} else if (job_gen == 60 || job_gen == 61) {
+		mes "- Zing Zing Zigi Zigi -";
+		next;
+		mes "- Zing Zing Zigi Zigi -";
+		next;
+		mes "[Devries]";
+		mes "What the hell is Demi Calberine doing?";
+		mes "That's really a noisy one.";
+		next;
+		mes "[Devries]";
+		mes "Your study is done, Popo?";
+		mes "Give me those seeds.";
+		next;
+		if (countitem(6273) == 0 && countitem(6272) == 0) {
 			mes "[Devries]";
-			mes "Your study is done, Popo?";
-			mes "Give me those seeds.";
-			next;
-			if ((countitem(6273) == 0) && (countitem(6272) == 0)){
-				mes "[Devries]";
-				mes "What is this?";
-				mes "How can you say you're done with your study?";
-				mes "Hurry up and start over.";
-				set job_gen,7;
-				if (checkquest(2209) == 1) erasequest 2209;
-				if (checkquest(2210) == 1) erasequest 2210;
-				if (checkquest(2211) == 1) erasequest 2211;
-				if (checkquest(2212) == 1) erasequest 2212;
-				if (checkquest(2213) == 1) erasequest 2213;
-				if (checkquest(2214) == 1) erasequest 2214;
-				close;
-			}
+			mes "What happened?";
+			mes "How could you say the study is completed without any result?";
+			mes "Start again.";
+			set job_gen,7;
+		} else {
 			mes "[Devries]";
 			mes "Well, I'll take a look at the seeds Popo made.";
 			mes "What's the result?";
@@ -423,9 +429,9 @@ job3_gen01,25,58,3	script	Devries#gen	865,{
 			mes "[Devries]";
 			mes "Damn!";
 			next;
-			if (job_gen == 60){
-				specialeffect EF_FLASHER;
-				specialeffect EF_PHARMACY_OK;
+			if (job_gen == 60) {
+				specialeffect EF_FLASHER,AREA,"Super Cultivator#gen";
+				specialeffect EF_PHARMACY_OK,AREA,"Super Cultivator#gen";
 				mes "[Devries]";
 				mes "Popo, look at that!";
 				mes "That's really a mysterious plant!";
@@ -447,126 +453,121 @@ job3_gen01,25,58,3	script	Devries#gen	865,{
 				mes "I will send a recommendation letter saying that your ability is really great and that you could be a brilliant member.";
 				next;
 				mes "[Devries]";
-				mes "Getting an answer from the Union will take some time, so could you next; a moment?";
+				mes "Getting an answer from the Union will take some time, so could you wait a moment?";
 				mes "Why don't you go up to Demi Calberine?";
 				next;
 				mes "[Devries]";
 				mes "She is a fellow Geneticist, specializing in mini cannons.";
 				mes "Go take a look at her experiment results.";
 				mes "Could you give this message to her? Tell her to conduct her experiments quietly.";
-				delitem 6273,1;
+				delitem 6273,1; //Altered_Seed
 				set job_gen,62;
 				changequest 2215,2216;
-				if (checkquest(2209) == 1) erasequest 2209;
-				if (checkquest(2210) == 1) erasequest 2210;
-				if (checkquest(2211) == 1) erasequest 2211;
-				if (checkquest(2212) == 1) erasequest 2212;
-				if (checkquest(2213) == 1) erasequest 2213;
-				if (checkquest(2214) == 1) erasequest 2214;
-				close;
-			}
-				specialeffect EF_SPELLBREAKER;
-				specialeffect EF_PHARMACY_FAIL;
+			} else {
+				specialeffect EF_SPELLBREAKER,AREA,"Super Cultivator#gen";
+				specialeffect EF_PHARMACY_FAIL,AREA,"Super Cultivator#gen";
 				mes "[Devries]";
 				mes "Uh oh! You failed, Popo.";
 				mes "It didn't grow at all, it's withered already.";
 				mes "Go and start over!";
-				delitem 6272,1;
+				delitem 6272,1; //Experiment_Seed
 				set job_gen,7;
-				if (checkquest(2209) == 1) erasequest 2209;
-				if (checkquest(2210) == 1) erasequest 2210;
-				if (checkquest(2211) == 1) erasequest 2211;
-				if (checkquest(2212) == 1) erasequest 2212;
-				if (checkquest(2213) == 1) erasequest 2213;
-				if (checkquest(2214) == 1) erasequest 2214;
-				close;
-		}else if ((job_gen > 61) && (job_gen < 76)){
-			if (checkquest(2223,2) == 2){
-				mes "[Devries]";
-				mes "Oh, next; a second.";
-				mes "It seems that the mail's has arrived.";
-				set job_gen,76;
-				completequest 2223;
-				close;
 			}
+		}
+		if (checkquest(2209) == 1) erasequest 2209;
+		if (checkquest(2210) == 1) erasequest 2210;
+		if (checkquest(2211) == 1) erasequest 2211;
+		if (checkquest(2212) == 1) erasequest 2212;
+		if (checkquest(2213) == 1) erasequest 2213;
+		if (checkquest(2214) == 1) erasequest 2214;
+		close;
+	} else if (job_gen > 61 && job_gen < 76) {
+		if (checkquest(2223,HUNTING) == 2) {
 			mes "[Devries]";
-			mes "Why don't you go up to Demi Calberine whilst waiting for an answer from the Union?";
+			mes "Oh, wait a second.";
+			mes "It seems that the mail's has arrived.";
+			set job_gen,76;
+			completequest 2223;
 			close;
-		}else if (job_gen == 76){
-			mes "[Devries]";
-			mes "Popo!";
-			mes "I've got good news for you!";
-			next;
-			if ((Class == Job_Alchemist || Class == Job_Creator || Job_Baby_Alchemist) && ((JobLevel > 49) && (SkillPoint == 0) && (BaseLevel > 98))){
-				if (checkcart() == 0){
-					mes "[Devries]";
-					mes "First take off that heavy and dirty cart, that doesn't suit you on this happy moment.";
-					close;
-				}
-				if(checkweight(1201,1) == 0){
-					mes "- Wait a minute !! -";
-					mes "- Currently you're carrying -";
-					mes "- too many items with you. -";
-					mes "- Please try again -";
-					mes "- after you lose some weight. -";
-					close;
-				}
-				mes "[Devries]";
-				mes "A letter has arrived from the Alchemist Union.";
-				mes "I'll read it to you, Popo!";
-				next;
-				mes "<Dearest Miss Devries,>";
-				mes "<We are very aware of the brilliant activities you've shown lately.>";
-				next;
-				mes "<Miss. Devries>";
-				mes "This guy is also from my hometown.";
-				next;
-				mes "<I heard very good news that your research results are taking the step of commercial use.>";
-				mes "<I'm sure it will be a great inspiration for other Alchemists.>";
-				next;
-				mes "<Come to think of it, you've attached a paper?>";
-				mes "<It was a new plant which makes plants grow super-fast, discovered by an Alchemist named, "+strcharinfo(0)+">";
-				next;
-				mes "<Myself and many other Alchemists from the Alchemist union are taking great interest in this.>";
-				next;
-				mes "<We are looking forward to more volumes of study papers and outcomes, especially from other Geneticists who've heard this news.>";
-				next;
-				mes "<Miss. Devries>";
-				mes "<I think that "+strcharinfo(0)+" has enough ability and talent to be a Geneticist.>";
-				next;
-				mes "<Please tell "+strcharinfo(0)+" as soon as possible that we are expecting remarkable activities as a Geneticist from now on.>";
-				next;
-				mes "<The Alchemist Union is very proud of Miss Devries, Miss Demi Calberine and "+strcharinfo(0)+" who are excellent talented people.>";
-				mes "<We hope that you yield good fruits in the future as well.>";
-				next;
-				mes "[Devries]";
-				mes "Congratulations, Popo!";
-				mes "You are a Geneticist from now on!!";
-				if(Class == Job_Baby_Alchemist){
-					jobchange Job_Baby_Genetic;
-				}
-				else if (Class == Job_Alchemist){
-					jobchange Job_Genetic;
-				} else {
-					jobchange Job_Genetic_T;
-				}
-				set job_gen,77;
-				getitem 5752,1;
-				getitem 2795,1;
-				next;
-				mes "[Devries]";
-				mes "Just like the word from the Union, I'm also looking forward to your awesome activities.";
-				mes "Let's try hard together! To become the best Geneticist!";
-				close;
-			}
-		}else if (job_gen == 77){
-			mes "[Devries]";
-			mes "Popo, do you want to join my Love Orleans club? It's a club for those that love cookies. Of course, we don't think of doing weird things with Charles Orleans.";
+		}
+		mes "[Devries]";
+		mes "You can take a look at the Demi Calberine's work place while we get an answer from the Union.";
+		close;
+	} else if (job_gen == 76) {
+		mes "[Devries]";
+		mes "Popo!";
+		mes "I've got good news for you!";
+		next;
+		if (checkweight(1201,2) == 0 || MaxWeight - Weight < 2000) {
+			mes "- Wait a minute !! -";
+			mes "- Currently you're carrying -";
+			mes "- too many items with you. -";
+			mes "- Please try again -";
+			mes "- after you lose some weight. -";
 			close;
 		}
 		mes "[Devries]";
-		mes "- You still have some unused skill points. -";
-		close;;
+		if (BaseJob != Job_Alchemist || BaseLevel < 99 || JobLevel < 50) {
+			mes "Oh, it looks like you're not ready to hear it.";
+			close;
+		}
+		if (checkcart()){
+			mes "First take off that heavy and dirty cart, that doesn't suit you on this happy moment.";
+			close;
+		}
+		if (SkillPoint != 0) {
+			mes "But you look like you have a lingering desire for previous studies.";
+			close;
+		}
+		mes "A letter has arrived from the Alchemist Union.";
+		mes "I'll read it to you, Popo!";
+		next;
+		mes "<Dearest Miss Devries,>";
+		mes "<We are very aware of the brilliant activities you've shown lately.>";
+		next;
+		mes "<Miss. Devries>";
+		mes "This guy is also from my hometown.";
+		next;
+		mes "<I heard very good news that your research results are taking the step of commercial use.>";
+		mes "<I'm sure it will be a great inspiration for other Alchemists.>";
+		next;
+		mes "<Come to think of it, you've attached a paper?>";
+		mes "<It was a new plant which makes plants grow super-fast, discovered by an Alchemist named, "+strcharinfo(0)+">";
+		next;
+		mes "<Myself and many other Alchemists from the Alchemist union are taking great interest in this.>";
+		next;
+		mes "<We are looking forward to more volumes of study papers and outcomes, especially from other Geneticists who?ve heard this news.>";
+		next;
+		mes "<Miss. Devries>";
+		mes "<I think that "+strcharinfo(0)+" has enough ability and talent to be a Geneticist.>";
+		next;
+		mes "<Please tell "+strcharinfo(0)+" as soon as possible that we are expecting remarkable activities as a Geneticist from now on.>";
+		next;
+		mes "<The Alchemist Union is very proud of Miss Devries, Miss Demi Calberine and "+strcharinfo(0)+" who are excellent talented people.>";
+		mes "<We hope that you yield good fruits in the future as well.>";
+		next;
+		mes "[Devries]";
+		if (ismounting()) {
+			mes "You are on a riding pet,";
+			mes "so you cannot change your job.";
+			mes "Please unequip your riding pet and try again!";
+			close;
+		}
+		mes "Congratulations, Popo!";
+		mes "You are a Geneticist from now on!!";
+		jobchange roclass(eaclass()|EAJL_THIRD);
+		set job_gen,77;
+		getitem 5752,1; //Midas_Whisper
+		getitem 2795,1; //Green_Apple_Ring
+		next;
+		mes "[Devries]";
+		mes "Just like the word from the Union, I'm also looking forward to your awesome activities.";
+		mes "Let's try hard together! To become the best Geneticist!";
+		close;
+	} else if (job_gen == 77) {
+		mes "[Devries]";
+		mes "Popo, do you want to join my Love Orleans club? It's a club for those that love cookies. Of course, we don't think of doing weird things with Charles Orleans.";
+		close;
 	}
 	mes "[Devries]";
 	mes "Am I that pretty to you? Why are you staring at me like that?";
@@ -575,19 +576,21 @@ job3_gen01,25,58,3	script	Devries#gen	865,{
 
 job3_gen01,83,72,3	script	Delivery Box#generic	111,{
 	mes "- There's a big box. -";
-	if (job_gen == 2){
+	if (job_gen == 2) {
 		next;
-		switch(select("Open the box.:Check the address.:Do nothing.")){
+		switch(select("Open the box.:Check the address.:Do nothing.")) {
 		case 1:
 			mes "- There are several cookie bags which are packed carefully in the box. -";
 			next;
-			if(select("Take out a cookie bag.:Do nothing.") == 1){
+			switch(select("Take out a cookie bag.:Do nothing.")) {
+			case 1:
 				mes "- You've taken out a cookie bag out of the box. -";
 				set job_gen,3;
 				close;
+			case 2:
+				mes "You do nothing.";
+				close;
 			}
-			mes "You do nothing.";
-			close;
 		case 2:
 			mes "[From: Rune-Midgarts Kingdom, Prontera, Charles Orleans]";
 			mes "[Recipient: Schwaltzvalt Republic, Lighthalzen, Devries]";
@@ -604,233 +607,156 @@ job3_gen01,12,56,3	script	Plant Guide#generic	111,{
 	mes "<The Easiest Alchemy in the World>";
 	mes "Written by Bob Ross.";
 	next;
-	switch(select("Animals:Plants:Minerals:Etc")){
+	switch(select("Animals:Plants:Minerals:Etc")) {
 	case 1:
-		mes "...Using animals in alchemy can easily be practiced by anyone.";
+		mes "...Using animals in Alchemy can easily be practiced by anyone.";
 		mes "You can put the animals that you want to use on the white tray, imagine the goal you want to make and then practice the alchemy.";
 		mes "It's very easy.";
 		next;
-		mes "...The animals that are used in alchemy might in the danger of getting extinct because of being captured by thoughtless alchemists.";
+		mes "...The animals that are used in Alchemy might in the danger of getting extinct because of being captured by thoughtless alchemists.";
 		mes "So I won't mention them.";
 		close;
 	case 2:
-		mes "...The guide of alchemy using plants is easy to follow, even for a little kid.";
+		mes "...The guide of Alchemy using plants is easy to follow, even for a little kid.";
 		mes "You can put the plants on the table, and break or cut them, connect them using a simple tool, then do alchemy.";
 		mes "That's really an extraordinary method.";
 		next;
-		mes "...The plants usually used for alchemy are Bigibigi Grass and Muka Trees that have sharp thorns but are delicate inside and Bogi Creeper whose growth speed is really fast but parasitic on living things.";
-		if (job_gen == 6){
+		mes "...The plants usually used for Alchemy are Bigibigi Grass and Muka Trees that have sharp thorns but are delicate inside and Bogi Creeper whose growth speed is really fast but parasitic on living things.";
+		if (job_gen == 6)
 			set job_gen,7;
-		}
 		close;
 	case 3:
-		mes "...Using minerals in alchemy is a way that beginners find pretty easy.";
+		mes "...Using minerals in Alchemy is a way that beginners find pretty easy.";
 		mes "You can put the minerals you want to in the beautifully crafted box, and sing any song that you can think of twice and then practice the alchemy.";
 		mes "That's really an easy way.";
 		next;
-		mes "...A mineral that's usually used for alchemy is 'Phracon' which doesn't cost a lot.";
+		mes "...A mineral that's usually used for Alchemy is 'Phracon' which doesn't cost a lot.";
 		close;
 	case 4:
 		mes "...Alchemy is the easiest thing in the world.";
-		mes "This writer shows a cobalt blue alchemy demonstration in front of students every week, and always get a big applaud from them.";
-		mes "I'm sure that you would be into the alchemy world at the moment you read this book.";
+		mes "This writer shows a cobalt blue Alchemy demonstration in front of students every week, and always get a big applaud from them.";
+		mes "I'm sure that you would be into the Alchemy world at the moment you read this book.";
 		close;
 	}
 }
 
-job3_gen01,36,55,3	script	Bigibigi Grass#gen	844,{
-	if (job_gen == 7){
-		if (checkquest(2209) == -1 || checkquest(2209) == 0){
-			mes "- The size is quite big to be normal grass so it's called Bigibigi Grass. -";
-			next;
-			if(select("Use it as a material.:Do not use.") == 1){
-				mes "- You've acquired Bigibigi Grass. -";
-				setquest 2209;
+// QuestID,PlantName,Description{,Part?}
+function	script	Genetic_Job_Plant	{
+	if (job_gen == 7) {
+		if (checkquest(getarg(0)) == -1 || checkquest(getarg(0)) == 0) {
+			mes "- "+getarg(2)+" -";
+			next;
+			switch(select("Use it as a material.:Do not use.")) {
+			case 1:
+				if (getarg(3,0)) set .@str$,"some of the ";
+				mes "- You've acquired "+.@str$+getarg(1)+". -";
+				setquest getarg(0);
+				close;
+			case 2:
+				mes "- This plant doesn't look suitable as an experiment sample. -";
 				close;
 			}
-			mes "- This plant doesn't look suitable as an experiment sample. -";
-			close;
 		}
-		mes "- You've already acquired Bigibigi Grass. -";
+		mes "- You've already acquired "+getarg(1)+". -";
 		close;
-	}else if (job_gen == 6){
+	} else if (job_gen == 6) {
 		mes "Information related to this plant can be found in the Plant Guide in the cabinet.";
 		close;
 	}
-	mes "- The size is quite big to be normal grass so it's called Bigibigi Grass. -";
+	mes "- "+getarg(2)+" -";
 	close;
 }
 
+job3_gen01,36,55,3	script	Bigibigi Grass#gen	844,{
+	callfunc "Genetic_Job_Plant",2209,"Bigibigi Grass","The size is quite big to be normal grass so it's called Bigibigi Grass.";
+	end;
+}
 job3_gen01,36,45,3	script	Muka Tree#gen	844,{
-	if (job_gen == 7){
-		if (checkquest(2210) == -1 || checkquest(2210) == 0){
-			mes "- This is the Muka Tree which protects its delicate inside with sharp thorns. -";
-			next;
-			if(select("Use it as a material.:Do not use.") == 1){
-				mes "- You've acquired some of the Muka Tree.-";
-				setquest 2210;
-				close;
-			}
-			mes "- This plant doesn't look suitable as an experiment sample. -";
-			close;
-		}
-		mes "- You've already acquired Muka Tree. -";
-		close;
-	}else if (job_gen == 6){
-		mes "Information related to this plant can be found in the Plant Guide in the cabinet.";
-		close;
-	}
-	mes "- This is the Muka Tree which protects its delicate inside with sharp thorns. -";
-	close;
+	callfunc "Genetic_Job_Plant",2210,"Muka Tree","This is the Muka Tree which protects its delicate inside with sharp thorns.",1;
+	end;
 }
-
 job3_gen01,42,55,3	script	Bogi Vine#gen	844,{
-	if (job_gen == 7){
-		if (checkquest(2211) == -1 || checkquest(2211) == 0){
-			mes "- This is a Bogi Vine which has a very fast growth speed. -";
-			next;
-			if(select("Use it as a material.:Do not use.") == 1){
-				mes "- You've acquired some of the Bogi Vine. -";
-				setquest 2211;
-				close;
-			}
-			mes "- This plant doesn't look suited to be used as a material. -";
-			close;
-		}
-		mes "- You've already acquired Bogi Vine. -";
-		close;
-	}else if (job_gen == 6){
-		mes "Information related to this plant can be found in the Plant Guide in the cabinet.";
-		close;
-	}
-	mes "- This is a Bogi Vine which has a very fast growth speed. -";
-	close;
+	callfunc "Genetic_Job_Plant",2211,"Bogi Vine","This is a Bogi Vine which has a very fast growth speed.",1;
+	end;
 }
-
 job3_gen01,30,58,3	script	Aolatura#gen	844,{
-	if (job_gen == 7){
-		if (checkquest(2212) == -1 || checkquest(2212) == 0){
-			mes "- This is known to blossom then thousand flowers as it only blooms once per lifetime. -";
-			next;
-			if(select("Use it as a material.:Do not use.") == 1){
-				mes "- You've acquired Aolatura. -";
-				setquest 2212;
-				close;
-			}
-			mes "- This plant doesn't look suitable as an experiment sample. -";
-			close;
-		}
-		mes "- You've already acquired Aolatura. -";
-		close;
-	}else if (job_gen == 6){
-		mes "Information related to this plant can be found in the Plant Guide in the cabinet.";
-		close;
-	}
-	mes "- This is known to blossom then thousand flowers as it only blooms once per lifetime. -";
-	close;
+	callfunc "Genetic_Job_Plant",2212,"Aolatura","This is known to blossom then thousand flowers as it only blooms once per lifetime.";
+	end;
 }
-
 job3_gen01,30,63,3	script	Congra#gen	844,{
-	if (job_gen == 7){
-		if (checkquest(2213) == -1 || checkquest(2213) == 0){
-			mes "- It's a plant that has a big and solid stem with enormous leaves. -";
-			next;
-			if(select("Use it as a material.:Do not use.") == 1){
-				mes "- You've acquired Congra. -";
-				setquest 2213;
-				close;
-			}
-			mes "- This plant doesn't look suitable as an experiment sample. -";
-			close;
-		}
-		mes "- You've already acquired Congra. -";
-		close;
-	}else if (job_gen == 6){
-		mes "Information related to this plant can be found in the Plant Guide in the cabinet.";
-		close;
-	}
-	mes "- It's a plant that has a big and solid stem with enormous leaves. -";
-	close;
+	callfunc "Genetic_Job_Plant",2213,"Congra","It's a plant that has a big and solid stem with enormous leaves.";
+	end;
 }
-
 job3_gen01,32,38,3	script	Sticky Grass#gen	844,{
-	if (job_gen == 7){
-		if (checkquest(2214) == -1 || checkquest(2214) == 0){
-			mes "- I may not know the name but it's sticky and can stick to just about anything. -";
-			next;
-			if(select("Use it as a material.:Do not use.") == 1){
-				mes "- You've acquired Sticky Grass -";
-				setquest 2214;
-				close;
-			}
-			mes "- This plant doesn't look suitable as an experiment sample. -";
-			close;
-		}
-		mes "- You've already acquired Sticky Grass -";
-		close;
-	}else if (job_gen == 6){
-		mes "Information related to this plant can be found in the Plant Guide in the cabinet.";
-		close;
-	}
-	mes "- I may not know the name but it's sticky and can stick to just about anything. -";
-	close;
+	callfunc "Genetic_Job_Plant",2214,"Sticky Grass","I may not know the name but it's sticky and can stick to just about anything.";
+	end;
 }
 
 job3_gen01,7,50,3	script	Testing Table#gen	844,{
-	if (job_gen == 7){
-		mes "- This is a testing table with a lot of equipemnt. I think I can study the combinations here with plants. -";
+	if (job_gen == 7) {
+		mes "- This is a testing table with a lot of equipment. I think I can study the combinations here with plants. -";
 		next;
-		if(select("Conduct an experiment.:Do not conduct an experiment.") == 1){
-			if ((checkquest(2209) == -1 || checkquest(2209) == 0) && (checkquest(2210) == -1 || checkquest(2210) == 0) && (checkquest(2211) == -1 || checkquest(2211) == 0) && (checkquest(2212) == -1 || checkquest(2212) == 0) && (checkquest(2213) == -1 || checkquest(2213) == 0) && (checkquest(2214) == -1 || checkquest(2214) == 0)){
-				mes "["+strcharinfo(0)+"]";
-				mes "Hmm, I need to gather plant materials first.";
-				close;
-			}
-			mes "What shall I do with these plant materials?";
-			next;
-			select("Break.:Smash into little pieces.:Crush.");
-			while(1){
-				if (.@fortune == 7) break;
-				mes "What shall I do now?";
-				next;
-				set .@rand,rand(1,2);
-				if (rand(1,2) == 1) select("Burn into Ashes.:Dip innto distilled water.:Steam.");
-				else select("Put it into a Testing Flask and Shake.:Freeze.:Heat.");
-				set .@fortune,rand(1,7);
-			}
+		if(select("Conduct an experiment.:Do not conduct an experiment.") == 2) {
+			mes "- It's not the time to start an experiment. -";
+			close;
+		}
+		if ((checkquest(2209) == -1 || checkquest(2209) == 0) &&
+		    (checkquest(2210) == -1 || checkquest(2210) == 0) &&
+		    (checkquest(2211) == -1 || checkquest(2211) == 0) &&
+		    (checkquest(2212) == -1 || checkquest(2212) == 0) &&
+		    (checkquest(2213) == -1 || checkquest(2213) == 0) &&
+		    (checkquest(2214) == -1 || checkquest(2214) == 0)) {
+			mes "["+strcharinfo(0)+"]";
+			mes "Hmm, I need to gather plant materials first.";
+			close;
+		}
+		mes "What shall I do with these plant materials?";
+		next;
+		select("Break.:Smash into little pieces.:Crush.");
+		while (1) {
 			mes "What shall I do now?";
 			next;
-			select("Inject it into a testing seed.");
-			mes "Which Seed do you want to use?";
-			next;
-			select("Testing Seed - Type A:Testing Seed - Type B:Testing Seed - Type C:Testing Seed Type - D");
-			mes "I've put the prepared materials into the chosen testing seed.";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Good. Now I can let Miss Devries take a look at this seed!";
-			if ((checkquest(2209) == -1 || checkquest(2209) == 0) && (checkquest(2210) == -1 || checkquest(2210) == 0) && (checkquest(2211) == -1 || checkquest(2211) == 0)){
-				set job_gen,61;
-				getitem 6272,1;
-				close;
-			}
-			if (checkquest(2209) == 1 || checkquest(2210) == 1 || checkquest(2211) == 1) set job_gen,job_gen+10;
-			set .@score,job_gen + JobLevel - 20;
-			if (rand(1,100) < .@score){
-				set job_gen,60;
-				getitem 6273,1;
-				close;
-			}
+			if (rand(2))
+				select("Burn into Ashes.:Dip into distilled water.:Steam.");
+			else
+				select("Put it into a Testing Flask and Shake.:Freeze.:Heat.");
+			if (!rand(7)) break;
+		}
+		mes "What shall I do now?";
+		next;
+		select("Inject it into a testing seed.");
+		mes "What kind of seed should I pick?";
+		next;
+		select("Testing Seed - Type A:Testing Seed - Type B:Testing Seed - Type C:Testing Seed - Type D");
+		mes "I've put the prepared materials into the chosen testing seed.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Good. Now I can let Miss Devries take a look at this seed!";
+		if ((checkquest(2209) == -1 || checkquest(2209) == 0) &&
+		    (checkquest(2210) == -1 || checkquest(2210) == 0) &&
+		    (checkquest(2211) == -1 || checkquest(2211) == 0)){
 			set job_gen,61;
-			getitem 6272,1;
+			getitem 6272,1; //Experiment_Seed
 			close;
 		}
-		mes "- It's not the time to start an experiment. -";
-		close;
-	}else if ((job_gen > 7) && (job_gen < 60)){
+		if (checkquest(2209) == 1) set job_gen,job_gen+10;
+		if (checkquest(2210) == 1) set job_gen,job_gen+10;
+		if (checkquest(2211) == 1) set job_gen,job_gen+10;
+		set .@score, job_gen + JobLevel - 20;
+		if (rand(1,100) < .@score) {
+			set job_gen,60;
+			getitem 6273,1; //Altered_Seed
+			close;
+		} else {
+			set job_gen,61;
+			getitem 6272,1; //Experiment_Seed
+			close;
+		}
+	} else if (job_gen > 7 && job_gen < 60) {
 		mes "- It looks like the experiment has failed. I better start over. -";
 		set job_gen,7;
-		if (countitem(6273) > 0) delitem 6273,1;
-		if (countitem(6272) > 0) delitem 6272,1;
+		if (countitem(6273)) delitem 6273,1; //Altered_Seed
+		if (countitem(6272)) delitem 6272,1; //Experiment_Seed
 		if (checkquest(2209) == 1) erasequest 2209;
 		if (checkquest(2210) == 1) erasequest 2210;
 		if (checkquest(2211) == 1) erasequest 2211;
@@ -838,23 +764,24 @@ job3_gen01,7,50,3	script	Testing Table#gen	844,{
 		if (checkquest(2213) == 1) erasequest 2213;
 		if (checkquest(2214) == 1) erasequest 2214;
 		close;
-	}else if (job_gen == 60 || job_gen == 61){
-		mes "- It looks like I need to let Miss Devries take a look at this seed!";
-		close;
+	} else if (job_gen == 60 || job_gen == 61) {
+		mes " - It looks like I need to let Miss Devries take a look at this seed! -";
+		end;
 	}
 	mes "- This is a testing table with a lot of equipment. I think I can study the combinations here with plants. -";
 	close;
 }
 
-//npc "job3_gen01" "Super Cultivator#gen" CLEAR_NPC 21 67 3 0 0
+job3_gen01,21,67,3	script	Super Cultivator#gen	844,{
+	end;
+}
 
 job3_gen01,91,48,3	script	Demi Calberine#gen	982,{
-	if (job_gen < 62){
-		mes "[Demi Calberine]";
+	mes "[Demi Calberine]";
+	if (job_gen < 62) {
 		mes "Hmm~ Where'd that bolt go?";
 		close;
-	}else if (job_gen == 62){
-		mes "[Demi Calberine]";
+	} else if (job_gen == 62) {
 		mes "Oh that blue cart~";
 		mes "Load picture-like cannon~";
 		mes "With my lovely darling~";
@@ -867,7 +794,7 @@ job3_gen01,91,48,3	script	Demi Calberine#gen	982,{
 		select("Hello~?");
 		mes "[Demi Calberine]";
 		mes "Oh, my~?";
-		mes "When did you.. Who are you?";
+		mes "When did you... Who are you?";
 		next;
 		mes "[Demi Calberine]";
 		mes "Oh, my god!";
@@ -878,17 +805,15 @@ job3_gen01,91,48,3	script	Demi Calberine#gen	982,{
 		next;
 		mes "[Demi Calberine]";
 		mes "Ugh~ I think they dropped around here somewhere.";
-		mes "I only need 12! I need to put the other parts together first.. Please could you help me?!";
+		mes "I only need 10! I need to put the other parts together first... Please could you help me?!";
 		changequest 2216,2217;
 		set job_gen,63;
 		close;
-	}else if ((job_gen > 62) && (job_gen < 74)){
-		mes "[Demi Calberine]";
+	} else if (job_gen > 62 && job_gen < 74) {
 		mes "Ah, oh no, oh no~~~";
 		mes "Did you find the parts? No, not yet? You promised, please hurry up!";
 		close;
-	}else if (job_gen == 74){
-		mes "[Demi Calberine]";
+	} else if (job_gen == 74) {
 		mes "With this cart, the firepower won't do well, then let's put it in this way...";
 		next;
 		select("I've got the parts.");
@@ -905,7 +830,7 @@ job3_gen01,91,48,3	script	Demi Calberine#gen	982,{
 		mes "I don't even know where my mind is.";
 		next;
 		mes "[Demi Calberine]";
-		mes "Please next; a moment.";
+		mes "Please wait a moment.";
 		mes "I will be done quickly with these.";
 		next;
 		mes "- Snap Snap Snap -";
@@ -948,12 +873,12 @@ job3_gen01,91,48,3	script	Demi Calberine#gen	982,{
 		mes "[Demi Calberine]";
 		mes "Miss Devries seems to be studying childish experiments downstairs.";
 		mes "I don't understand why those research papers get so popular.";
-		emotion e_rice;
+		emotion e_pif;
 		next;
 		mes "[Demi Calberine]";
 		mes "See this mini-mini cannon.";
 		mes "This is the smallest and the lightest cannon in the world.";
-		mes "This is what I made but isn't this so cute? Yipee~";
+		mes "This is what I made but isn?t this so cute? Yipee~";
 		emotion e_awsm;
 		next;
 		select("Can I get my cart remodeled?");
@@ -967,7 +892,7 @@ job3_gen01,91,48,3	script	Demi Calberine#gen	982,{
 		mes "Hohoho.";
 		next;
 		mes "[Demi Calberine]";
-		mes "And what's more, you can't so the cart remodeling to just any cart.";
+		mes "And what's more, you can?t so the cart remodeling to just any cart.";
 		mes "It can only be done on quality certified carts that've been polished for a long time.";
 		next;
 		mes "[Demi Calberine]";
@@ -976,7 +901,7 @@ job3_gen01,91,48,3	script	Demi Calberine#gen	982,{
 		next;
 		mes "[Demi Calberine]";
 		mes "If you want, ^FF0000I'll show you a good training spot.^000000";
-		mes "^FF0000TDevries won't like it much^000000, but it's the best place. Haha.";
+		mes "^FF0000Devries won't like it much^000000, but it's the best place. Haha.";
 		next;
 		mes "[Demi Calberine]";
 		mes "How about you swing your cart around as practice?";
@@ -995,256 +920,76 @@ job3_gen01,91,48,3	script	Demi Calberine#gen	982,{
 		close2;
 		warp "job3_gen01",23,32;
 		end;
-	}else if (job_gen == 75){
-		if (checkquest(2223,2) == 2){
-			mes "[Demi Calberine]";
+	} else if (job_gen == 75) {
+		if (checkquest(2223,HUNTING) == 2) {
 			mes "It seem Miss Devries found out that I put you in her spore pen.";
 			mes "It's funny when you look at her face. After you've killed all those spores.";
 			close;
 		}
-		mes "[Demi Calberine]";
-			mes "Sigh, haven't you finished practicing?";
-			mes "Do you want to enter the spore pen?";
+		mes "Sigh, haven't you finished practicing?";
+		mes "Do you want to enter the spore pen?";
 		next;
-		if(select("Yes.:No.") == 1){
+		switch(select("Yes.:No.")) {
+		case 1:
 			mes "[Demi Calberine]";
 			mes "Have fun swinging your cart around~";
 			close2;
 			warp "job3_gen01",23,32;
 			end;
+		case 2:
+			mes "[Demi Calberine]";
+			mes "What a shame! I wanted to see Miss Devries's angry face.";
+			close;
 		}
-		mes "[Demi Calberine]";
-		mes "What a shame! I wanted to see Miss Devries's angry face.";
-		close;
-	}else if (job_gen > 75){
-		mes "[Demi Calberine]";
+	} else if (job_gen > 75) {
 		mes "It seem Miss Devries found out that I put you in her spore pen.";
 		mes "It's funny when you look at her face. After you've killed all those spores.";
 		close;
 	}
-	mes "[Demi Calberine]";
-	mes "Hmm~ Where'd that bolt go?";
-	close;
-}
-
-job3_gen01,84,45,3	script	Scattered Stuff#gen1	111,{
-	goto OnDetails;
-	end;
-
-OnInit:
-	enablenpc "Scattered Stuff#gen1";
-	end;
-	
-OnDetails:
-	if ((job_gen > 62) && (job_gen < 74)){
-		mes "- There are so many scattered things on the floor that the lab is in chaos -";
-		next;
-		mes "- You found a little metal fragment. -";
-		set job_gen,job_gen+1;
-		disablenpc "Scattered Stuff#gen1";
-		initnpctimer;
-		close;
-	}else if (job_gen == 74){
-		mes "- I think I've gathered all of the parts. -";
-		close;
-	}
-	end;
-
-OnTimer7000:
-	enablenpc "Scattered Stuff#gen1";
-	stopnpctimer;
-	end;
-}
-
-job3_gen01,77,41,3	script	Scattered Stuff#gen2	111,{
-	goto OnDetails;
-	end;
-
-OnInit:
-	enablenpc "Scattered Stuff#gen2";
-	end;
-
-OnDetails:
-	if ((job_gen > 62) && (job_gen < 74)){
-		mes "- There are so many scattered things on the floor that the lab is in chaos -";
-		next;
-		mes "- You found a little metal fragment. -";
-		set job_gen,job_gen+1;
-		disablenpc "Scattered Stuff#gen2";
-		initnpctimer;
-		close;
-	}else if (job_gen == 74){
-		mes "- I think I've gathered all of the parts. -";
-		close;
-	}
-	end;
-
-OnTimer7000:
-	enablenpc "Scattered Stuff#gen2";
-	stopnpctimer;
-	end;
-}
-
-job3_gen01,78,57,3	script	Scattered Stuff#gen3	111,{
-	goto OnDetails;
-	end;
-
-OnInit:
-	enablenpc "Scattered Stuff#gen3";
-	end;
-
-OnDetails:
-	if ((job_gen > 62) && (job_gen < 74)){
-		mes "- There are so many scattered things on the floor that the lab is in chaos -";
-		next;
-		mes "- You found a little metal fragment. -";
-		set job_gen,job_gen+1;
-		disablenpc "Scattered Stuff#gen3";
-		initnpctimer;
-		close;
-	}else if (job_gen == 74){
-		mes "- I think I've gathered all of the parts. -";
-		close;
-	}
-	end;
-
-OnTimer7000:
-	enablenpc "Scattered Stuff#gen3";
-	stopnpctimer;
-	end;
-}
-
-job3_gen01,89,59,3	script	Scattered Stuff#gen4	111,{
-	goto OnDetails;
-	end;
-
-OnInit:
-	enablenpc "Scattered Stuff#gen4";
-	end;
-
-OnDetails:	
-	if ((job_gen > 62) && (job_gen < 74)){
-		mes "- There are so many scattered things on the floor that the lab is in chaos -";
-		next;
-		mes "- You found a little metal fragment. -";
-		set job_gen,job_gen+1;
-		disablenpc "Scattered Stuff#gen4";
-		initnpctimer;
-		close;
-	}else if (job_gen == 74){
-		mes "- I think I've gathered all of the parts. -";
-		close;
-	}
-	end;
-
-OnTimer7000:
-	enablenpc "Scattered Stuff#gen4";
-	stopnpctimer;
-	end;
-}
-
-job3_gen01,90,51,3	script	Scattered Stuff#gen5	111,{
-	goto OnDetails;
-	end;
-
-OnInit:
-	enablenpc "Scattered Stuff#gen5";
-	end;
-
-OnDetails:
-	if ((job_gen > 62) && (job_gen < 74)){
-		mes "- There are so many scattered things on the floor that the lab is in chaos -";
-		next;
-		mes "- You found a little metal fragment. -";
-		set job_gen,job_gen+1;
-		disablenpc "Scattered Stuff#gen5";
-		initnpctimer;
-		close;
-	}else if (job_gen == 74){
-		mes "- I think I've gathered all of the parts. -";
-		close;
-	}
-	end;
-
-OnTimer7000:
-	enablenpc "Scattered Stuff#gen5";
-	stopnpctimer;
-	end;
-}
-
-job3_gen01,83,27,3	script	Scattered Stuff#gen6	111,{
-	goto OnDetails;
-end;
-
-OnInit:
-	enablenpc "Scattered Stuff#gen6";
-	end;
-
-OnDetails:
-	if ((job_gen > 62) && (job_gen < 74)){
-		mes "- There are so many scattered things on the floor that the lab is in chaos -";
-		next;
-		mes "- You found a little metal fragment. -";
-		set job_gen,job_gen+1;
-		disablenpc "Scattered Stuff#gen6";
-		initnpctimer;
-		close;
-	}else if (job_gen == 74){
-		mes "- I think I've gathered all of the parts. -";
-		close;
-	}
-	end;
-
-OnTimer7000:
-	enablenpc "Scattered Stuff#gen6";
-	stopnpctimer;
-	end;
 }
 
-job3_gen01,74,45,3	script	Scattered Stuff#gen7	111,{
-	goto OnDetails;
-	end;
-
-OnInit:
-	enablenpc "Scattered Stuff#gen7";
-	end;
-
-OnDetails:
-	if ((job_gen > 62) & (job_gen < 74)){
-		mes "- There are so many scattered things on the floor that the lab is in chaos -";
+-	script	Scattered Stuff#gen	-1,{
+	if (job_gen > 62 && job_gen < 74) {
+		mes "- There are so many scattered things on the floor that the lab is in chaos. -";
 		next;
 		mes "- You found a little metal fragment. -";
 		set job_gen,job_gen+1;
-		disablenpc "Scattered Stuff#gen7";
+		disablenpc strnpcinfo(0);
 		initnpctimer;
 		close;
-	}else if (job_gen == 74){
+	} else if (job_gen == 74) {
 		mes "- I think I've gathered all of the parts. -";
 		close;
 	}
 	end;
-
 OnTimer7000:
-	enablenpc "Scattered Stuff#gen7";
+	enablenpc strnpcinfo(0);
 	stopnpctimer;
 	end;
 }
+job3_gen01,84,45,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen1	111
+job3_gen01,77,41,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen2	111
+job3_gen01,78,57,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen3	111
+job3_gen01,89,59,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen4	111
+job3_gen01,90,51,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen5	111
+job3_gen01,83,27,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen6	111
+job3_gen01,74,45,3	duplicate(Scattered Stuff#gen)	Scattered Stuff#gen7	111
 
 job3_gen01,18,39,3	script	Warning#gen	837,{
 	mes "= Warning =";
 	mes "If you bully my spores, I'll scream!!!";
-	if (job_gen > 74){
-		next;
-		if(select("Get out of the pen.:Stay still.") == 1){
-			mes "- I'd better get out before I get caught by Miss Devries. -";
-			close2;
-			warp "job3_gen01",21,38;
-			end;
-		}
+	if (job_gen < 75) close;
+	next;
+	switch(select("Get out of the pen.:Stay still.")) {
+	case 1:
+		mes "- I'd better get out before I get caught by Miss Devries. -";
+		close2;
+		warp "job3_gen01",21,38;
+		end;
+	case 2:
 		mes "- I decide to stay still. -";
 		close;
 	}
-	close;
 }
 
 job3_gen01,80,12,1	script	Stacked Magazines#gen	111,{
@@ -1264,40 +1009,21 @@ job3_gen01,85,25,1	script	Opened Book#gen	111,{
 	close;
 }
 
-job3_gen01,81,81,0	script	dbroom	139,2,2,{
+job3_gen01,81,81,0	script	#dbroom	139,2,2,{
 OnTouch:
 	mes "- It's a room that looks like a storehouse, thanks to so many parcels piled up in the room. -";
 	close;
 }
 
-job3_gen01,7,59,0	script	from1to2gen	45,1,1,{
-OnTouch:
-	warp "job3_gen01",72,52;
-	end;
-}
-
-job3_gen01,71,56,0	script	#from2to1gen	45,1,1,{
-OnTouch:
-	warp "job3_gen01",11,60;
-	end;
-}
-
-lighthalzen,52,132,0	script	lighttogen	45,1,1,{
-OnTouch:
-	warp "job3_gen01",45,50;
-	end;
-}
-
-job3_gen01,49,49,0	script	gentolight	45,1,1,{
-OnTouch:
-	warp "lighthalzen",54,132;
-	end;
-}
-
-job3_gen01,24,32,0	script	Devries Vision	139,2,2,{
+job3_gen01,7,59,0	warp	#from1to2gen	1,1,job3_gen01,72,52
+job3_gen01,71,56,0	warp	#from2to1gen	1,1,job3_gen01,11,60
+lighthalzen,52,132,0	warp	#lighttogen	1,1,job3_gen01,45,50
+job3_gen01,49,49,0	warp	#gentolight	1,1,lighthalzen,54,132
+job3_gen01,24,32,0	script	The gaze of Devries	139,2,2,{
 OnTouch:
-	if (checkquest(2223,2) == 2){
-		mapannounce "job3_gen01","Devries: Whoa? Was there a lost kitty in the spore pen?",bc_map;
+	if (checkquest(2223,HUNTING) == 2) {
+		mapannounce "job3_gen01","Devries: Whoa? Was there a lost kitty in the spore pen?",bc_map,"0x99CC00"; //FW_NORMAL 12 0 0
+		emotion e_omg,1;
 		warp "job3_gen01",21,38;
 	}
 	end;
diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt
index 0347345da..38a6cab22 100644
--- a/npc/re/jobs/3-2/minstrel.txt
+++ b/npc/re/jobs/3-2/minstrel.txt
@@ -1,17 +1,16 @@
 //===== rAthena Script ======================================= 
-// Minstrel Job change Quest
+//= Minstrel Job Quest
 //===== By: ================================================== 
-//= Masao
-//= Credits: Muad_Dib
+//= Muad_Dib
 //===== Current Version: ===================================== 
 //= 1.2
 //===== Compatible With: ===================================== 
 //= Any rAthena SVN
 //===== Description: ========================================= 
-//= [Translated from the Official]
+//= [Official Conversion]
 //= Job change Quest from Bard / Clown -> Minstrel.
 //===== Additional Comments: ================================= 
-//= 1.0 First Version.
+//= 1.0 First Version. [Masao]
 //= 1.1 Fix the checking of requirements before job change to Minstel [JayPee]
 //= 1.2 Optimized. [Euphy]
 //============================================================
diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt
index 4a96bed59..a7f21d763 100644
--- a/npc/re/jobs/3-2/royal_guard.txt
+++ b/npc/re/jobs/3-2/royal_guard.txt
@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-// Royal Guard Job change Quest
+//= Royal Guard Job Quest
 //===== By: ================================================== 
 //= Muad_Dib
 //===== Current Version: ===================================== 
diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt
index b94de3395..e04899d9c 100644
--- a/npc/re/jobs/3-2/shadow_chaser.txt
+++ b/npc/re/jobs/3-2/shadow_chaser.txt
@@ -1,12 +1,12 @@
 //===== rAthena Script ======================================= 
-// Shadow Chaser Job Change Quest
+//= Shadow Chaser Job Quest
 //===== By: ================================================== 
 //= ultragunner
 //= Credits: Oshinoke
 //===== Current Version: ===================================== 
 //= 1.2
 //===== Compatible With: ===================================== 
-//= rAthena
+//= rAthena SVN
 //===== Description: ========================================= 
 //= Job change Quest from Rogue / Stalker -> Shadow Chaser.
 //= Based on Official pRO server
diff --git a/npc/re/jobs/3-2/sorcerer.txt b/npc/re/jobs/3-2/sorcerer.txt
index 761a34e0d..712e01452 100644
--- a/npc/re/jobs/3-2/sorcerer.txt
+++ b/npc/re/jobs/3-2/sorcerer.txt
@@ -1,11 +1,11 @@
 //===== rAthena Script ======================================= 
-// Sorcerer Job change Quest
+//= Sorcerer Job Quest
 //===== By: ================================================== 
 //= Muad_Dib
 //===== Current Version: ===================================== 
 //= 1.2
 //===== Compatible With: ===================================== 
-//= Any rAthena SVN
+//= rAthena SVN
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= Job change Quest from Sage / Professor -> Sorcerer.
@@ -137,7 +137,7 @@ gef_tower,113,161,5	script	Karacas	754,{
 		mes "You look happy. Have a great journey.";
 		close;
 	}
-	if ((JobLevel < 50) || (SkillPoint != 0) || (BaseLevel < 99)) {
+	if (BaseLevel < 99 || JobLevel < 50 || SkillPoint != 0) {
 		mes "Is there anything I can do for you?";
 		close;
 	}
diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt
index 4b641fb23..b31719934 100644
--- a/npc/re/jobs/3-2/sura.txt
+++ b/npc/re/jobs/3-2/sura.txt
@@ -1,150 +1,31 @@
 //===== rAthena Script ======================================= 
-// Sura Job change Quest
+//= Sura Job Quest
 //===== By: ================================================== 
-//= Masao
-//= Credits: Muad_Dib, Gepard
+//= Muad_Dib, Gepard
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
-//= Any rAthena SVN
+//= rAthena SVN
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= Job change Quest from Monk / Champion -> Sura.
 //===== Additional Comments: ================================= 
-//= 1.0 First Version.
+//= 1.0 First Version. [Masao]
 //= 1.1 Removed disablenpc which causes players stucked in waitingroom. [Joseph]
+//= 1.2 Updated script, optimized. [Euphy]
 //============================================================
 
 ve_in,237,125,0	script	King Crab#job_shu	107,{
-	if (job_shu == 0){
-		if (Class == Job_Monk || Class == Job_Champion || Job_Baby_Monk){
-			if ((BaseLevel > 98) && (JobLevel > 49)){
-				mes "[King Crab]";
-				mes "Khh ha ha ha ha ha ha.";
-				mes "That little rookie was knocked out by my one blow!";
-				next;
-				mes "[Sludge Worm]";
-				mes "Those arrogant fellows deserve a bitter lesson.";
-				mes "How dare a little rookie attack you, boss!";
-				next;
-				mes "[King Crab]";
-				mes "Ha ha ha ha ha ha ha!!!!";
-				next;
-				mes "[Sludge Worm]";
-				mes "Hey! Right here!!! One more cup of beer!!!";
-				mes "What are you doing? My boss's cup is already empty! Come quickly!";
-				next;
-				mes "[Waitress]";
-				mes "Yes, I will bring it right away.";
-				next;
-				mes "[Sludge Worm]";
-				mes "Too slow!!! Who do you think my boss is? Huh!?";
-				next;
-				mes "[Waitress]";
-				mes "I... I'm really sorry, sir...";
-				next;
-				mes "[King Crab]";
-				mes "K k k k k. That's enough.";
-				mes "That cute girl seems to be scared of you!";
-				mes "Hey lady~ We are not scary people~~";
-				next;
-				mes "[Waitress]";
-				mes "Aaaaaaaaaaak! Don't do this!!";
-				next;
-				mes "- Bang -";
-				donpcevent "???#bcmd::OnEnable";
-				next;
-				mes "[???]";
-				mes "Hey, there.";
-				mes "I've been watching you, making a ruckuss like you own this place.";
-				next;
-				mes "[???]";
-				mes "It's too noisy. So if you want to say that nonsense again, go home.";
-				next;
-				mes "[Sludge Worm]";
-				mes "What?!";
-				mes "I don't know who you are but you must've lost your mind!";
-				mes "Do you have any idea who my boss is?!!";
-				next;
-				mes "[Sludge Worm]";
-				mes "This is the famous King Crab!!!";
-				mes "Who can decimate entire armies with his fist!!!";
-				next;
-				mes "[???]";
-				mes "You do all the dirty things like your dirty face.";
-				mes "You're just a thug satisfying your desires.";
-				next;
-				mes "[King Crab]";
-				mes "What?";
-				mes "How dare you say those things?";
-				mes "Just because you're a girl doesn't mean I'll just let it go.";
-				next;
-				mes "[Sludge Worm]";
-				mes "Huh! The boss is really mad!";
-				mes "I can beat you up with one blow...";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Hey! How dare you use violence against a lady!?";
-				next;
-				mes "[???]";
-				mes "Move back, you little thing...";
-				next;
-				mes "[???]";
-				mes "Oh, I'm glad to hear that.";
-				mes "I won't attack first because I'm in the middle of training.";
-				next;
-				mes "[King Crab && Sludge Worm]";
-				mes "What?";
-				next;
-				mes "[King Crab && Sludge Worm]";
-				mes "Uhhhh?!";
-				next;
-				mes "[King Crab && Sludge Worm]";
-				mes "Aaaaaahhhhhhhhk!!!!!!!!";
-				specialeffect EF_FIRESPLASHHIT,"King Crab#job_shu";
-				specialeffect EF_FIRESPLASHHIT,"Sludge Worm#job_shu";
-				next;
-				mes "- What is that amazing power? -";
-				mes "- I've never seen this";
-				mes "- kind of skill before... -";
-				next;
-				mes "[???]";
-				mes "Well, the mood is spoiled...";
-				next;
-				mes "[Waitress]";
-				mes "Tha... Thank you so much...";
-				mes "How can I repay you?";
-				next;
-				mes "[???]";
-				mes "It's not a big deal. It's okay.";
-				next;
-				mes "[Waitress]";
-				mes "Are you going back to your lodging?";
-				mes "If it's okay with you, can I deliver you a meal?";
-				next;
-				mes "[???]";
-				mes "Oh, you don't really need to.";
-				mes "Just a slice of bread and warm soup will be enough for me.";
-				mes "Then, I've got to say goodbye. Bye.";
-				donpcevent "???#bcmd::OnDisable";
-				next;
-				mes "[Waitress]";
-				mes "Bye...";
-				mes "...";
-				mes ".....";
-				mes "........(cheeks glowing)";
-				set job_shu,1;
-				setquest 11155;
-				close;
-			}
-			mes "[King Crab]";
-			mes "Khh ha ha ha ha ha ha";
-			mes "That little rookie was knocked out by my one blow!";
-			next;
-			mes "[Sludge Worm]";
-			mes "Those arrogant fellows deserve a bitter lesson.";
-			mes "How dare a little rookie attack my boss!";
-			next;
+	if (job_shu == 0) {
+		mes "[King Crab]";
+		mes "Khh ha ha ha ha ha ha.";
+		mes "That little rookie was knocked out by my one blow!";
+		next;
+		mes "[Sludge Worm]";
+		mes "Those arrogant fellows deserve a bitter lesson.";
+		mes "How dare a little rookie attack you, boss!";
+		next;
+		if (BaseJob != Job_Monk || BaseLevel < 99 || JobLevel < 50) {
 			mes "[King Crab]";
 			mes "Khhha ha ha ha ha ha!!!!";
 			mes "One more cup of beer, here!!!";
@@ -154,203 +35,142 @@ ve_in,237,125,0	script	King Crab#job_shu	107,{
 			mes "King Crab!!! I will follow you forever!!";
 			close;
 		}
-	}
-	mes "[King Crab]";
-	mes "Khh ha ha ha ha ha ha";
-	mes "That little rookie was knocked out by my one blow!";
-	next;
-	mes "[Sludge Worm]";
-	mes "Those arrogant fellows deserve a bitter lesson.";
-	mes "How dare a little rookie attack my boss!";
-	next;
-	mes "[King Crab]";
-	mes "Khhha ha ha ha ha ha!!!!";
-	mes "One more cup of beer, here!!!";
-	mes "I will drink today!!!";
-	next;
-	mes "[Sludge Worm]";
-	mes "King Crab!!! I will follow you forever!!";
-	close;
-}
-
-ve_in,241,128,4	script	Sludge Worm#job_shu	110,{
-	if (job_shu == 0){
-		if (Class == Job_Monk || Class == Job_Champion || Job_Baby_Monk){
-			if ((BaseLevel > 98) && (JobLevel > 49)){
-				mes "[King Crab]";
-				mes "Khh ha ha ha ha ha ha.";
-				mes "That little rookie was knocked out by my one blow!";
-				next;
-				mes "[Sludge Worm]";
-				mes "Those arrogant fellows deserve a bitter lesson.";
-				mes "How dare a little rookie attack you, boss!";
-				next;
-				mes "[King Crab]";
-				mes "Ha ha ha ha ha ha ha!!!!";
-				next;
-				mes "[Sludge Worm]";
-				mes "Hey! Right here!!! One more cup of beer!!!";
-				mes "What are you doing? My boss's cup is already empty! Come quickly!";
-				next;
-				mes "[Waitress]";
-				mes "Yes, I will bring it right away.";
-				next;
-				mes "[Sludge Worm]";
-				mes "Too slow!!! Who do you think my boss is? Huh!?";
-				next;
-				mes "[Waitress]";
-				mes "I... I'm really sorry, sir...";
-				next;
-				mes "[King Crab]";
-				mes "K k k k k. That's enough.";
-				mes "That cute girl seems to be scared of you!";
-				mes "Hey lady~ We are not scary people~~";
-				next;
-				mes "[Waitress]";
-				mes "Aaaaaaaaaaak! Don't do this!!";
-				next;
-				mes "- Bang -";
-				donpcevent "???#bcmd::OnEnable";
-				next;
-				mes "[???]";
-				mes "Hey, there.";
-				mes "I've been watching you, making a ruckuss like you own this place.";
-				next;
-				mes "[???]";
-				mes "It's too noisy. So if you want to say that nonsense again, go home.";
-				next;
-				mes "[Sludge Worm]";
-				mes "What?!";
-				mes "I don't know who you are but you must've lost your mind!";
-				mes "Do you have any idea who my boss is?!!";
-				next;
-				mes "[Sludge Worm]";
-				mes "This is the famous King Crab!!!";
-				mes "Who can decimate entire armies with his fist!!!";
-				next;
-				mes "[???]";
-				mes "You do all the dirty things like your dirty face.";
-				mes "You're just a thug satisfying your desires.";
-				next;
-				mes "[King Crab]";
-				mes "What?";
-				mes "How dare you say those things?";
-				mes "Just because you're a girl doesn't mean I'll just let it go.";
-				next;
-				mes "[Sludge Worm]";
-				mes "Huh! The boss is really mad!";
-				mes "I can beat you up with one blow...";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Hey! How dare you use violence against a lady!?";
-				next;
-				mes "[???]";
-				mes "Move back, you little thing...";
-				next;
-				mes "[???]";
-				mes "Oh, I'm glad to hear that.";
-				mes "I won't attack first because I'm in the middle of training.";
-				next;
-				mes "[King Crab && Sludge Worm]";
-				mes "What?";
-				next;
-				mes "[King Crab && Sludge Worm]";
-				mes "Uhhhh?!";
-				next;
-				mes "[King Crab && Sludge Worm]";
-				mes "Aaaaaahhhhhhhhk!!!!!!!!";
-				specialeffect EF_FIRESPLASHHIT,"King Crab#job_shu";
-				specialeffect EF_FIRESPLASHHIT,"Sludge Worm#job_shu";
-				next;
-				mes "- What is that amazing power? -";
-				mes "- I've never seen this";
-				mes "- kind of skill before... -";
-				next;
-				mes "[???]";
-				mes "Well, the mood is spoiled...";
-				next;
-				mes "[Waitress]";
-				mes "Tha... Thank you so much...";
-				mes "How can I repay you?";
-				next;
-				mes "[???]";
-				mes "It's not a big deal. It's okay.";
-				next;
-				mes "[Waitress]";
-				mes "Are you going back to your lodging?";
-				mes "If it's okay with you, can I deliver you a meal?";
-				next;
-				mes "[???]";
-				mes "Oh, you don't really need to.";
-				mes "Just a slice of bread and warm soup will be enough for me.";
-				mes "Then, I've got to say goodbye. Bye.";
-				donpcevent "???#bcmd::OnDisable";
-				next;
-				mes "[Waitress]";
-				mes "Bye...";
-				mes "...";
-				mes ".....";
-				mes "........(cheeks glowing)";
-				set job_shu,1;
-				setquest 11155;
-				close;
-			}
-			mes "[King Crab]";
-			mes "Khh ha ha ha ha ha ha";
-			mes "That little rookie was knocked out by my one blow!";
-			next;
-			mes "[Sludge Worm]";
-			mes "Those arrogant fellows deserve a bitter lesson.";
-			mes "How dare a little rookie attack my boss!";
-			next;
+		mes "[King Crab]";
+		mes "Ha ha ha ha ha ha ha!!!!";
+		next;
+		mes "[Sludge Worm]";
+		mes "Hey! Right here!!! One more cup of beer!!!";
+		mes "What are you doing? My boss's cup is already empty! Come quickly!";
+		next;
+		mes "[Waitress]";
+		mes "Yes, I will bring it right away.";
+		next;
+		mes "[Sludge Worm]";
+		mes "Too slow!!! Who do you think my boss is? Huh!?";
+		next;
+		mes "[Waitress]";
+		mes "I... I'm really sorry, sir...";
+		next;
+		mes "[King Crab]";
+		mes "K k k k k. That's enough.";
+		mes "That cute girl seems to be scared of you!";
+		mes "Hey lady~ We are not scary people~~";
+		next;
+		mes "[Waitress]";
+		mes "Aaaaaaaaaaak! Don't do this!!";
+		next;
+		mes "- Bang -";
+		donpcevent "???#bcmd::OnEnable";
+		next;
+		mes "[???]";
+		mes "Hey, there.";
+		mes "I've been watching you, making a ruckus like you own this place.";
+		next;
+		mes "[???]";
+		mes "It's too noisy. So if you want to say that nonsense again, go home.";
+		next;
+		mes "[Sludge Worm]";
+		mes "What?!";
+		mes "I don't know who you are but you must've lost your mind!";
+		mes "Do you have any idea who my boss is?!!";
+		next;
+		mes "[Sludge Worm]";
+		mes "This is the famous King Crab!!!";
+		mes "Who can decimate entire armies with his fist!!!";
+		next;
+		mes "[???]";
+		mes "You do all the dirty things like your dirty face.";
+		mes "You're just a thug satisfying your desires.";
+		next;
+		mes "[King Crab]";
+		mes "What?";
+		mes "How dare you say those things?";
+		mes "Just because you're a girl doesn't mean I'll just let it go.";
+		next;
+		mes "[Sludge Worm]";
+		mes "Huh! The boss is really mad!";
+		mes "I can beat you up with one blow...";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Hey! How dare you use violence against a lady!?";
+		next;
+		mes "[???]";
+		mes "Move back, you little thing...";
+		next;
+		mes "[???]";
+		mes "Oh, I'm glad to hear that.";
+		mes "I won't attack first because I'm in the middle of training.";
+		next;
+		mes "[King Crab & Sludge Worm]";
+		mes "What?";
+		next;
+		mes "[King Crab & Sludge Worm]";
+		mes "Uhhhh?!";
+		next;
+		mes "[King Crab & Sludge Worm]";
+		mes "Aaaaaahhhhhhhhk!!!!!!!!";
+		specialeffect EF_FIRESPLASHHIT,AREA,"King Crab#job_shu";
+		specialeffect EF_FIRESPLASHHIT,AREA,"Sludge Worm#job_shu";
+		next;
+		mes "- What is that amazing power? -";
+		mes "- I've never seen this -";
+		mes "- kind of skill before... -";
+		next;
+		mes "[???]";
+		mes "Well, the mood is spoiled...";
+		next;
+		mes "[Waitress]";
+		mes "Tha... Thank you so much...";
+		mes "How can I repay you?";
+		next;
+		mes "[???]";
+		mes "It's not a big deal. It's okay.";
+		next;
+		mes "[Waitress]";
+		mes "Are you going back to your lodging?";
+		mes "If it's okay with you, can I deliver you a meal?";
+		next;
+		mes "[???]";
+		mes "Oh, you don't really need to.";
+		mes "Just a slice of bread and warm soup will be enough for me.";
+		mes "Then, I've got to say goodbye. Bye.";
+		donpcevent "???#bcmd::OnDisable";
+		next;
+		mes "[Waitress]";
+		mes "Bye...";
+		mes "...";
+		mes ".....";
+		mes "........(cheeks glowing)";
+		set job_shu,1;
+		setquest 11155;
+		close;
+	} else {
+		if (strnpcinfo(0) == "King Crab#job_shu") {
 			mes "[King Crab]";
-			mes "Khhha ha ha ha ha ha!!!!";
-			mes "One more cup of beer, here!!!";
-			mes "I will drink today!!!";
-			next;
+			mes "How come a little rookie knocked me out! Me! The great King Crab...";
+		} else {
 			mes "[Sludge Worm]";
-			mes "King Crab!!! I will follow you forever!!";
-			close;
+			mes "Boss... Are we really past our prime now?";
+			mes "Sob... sob...";
 		}
+		close;
 	}
-	mes "[King Crab]";
-	mes "Khh ha ha ha ha ha ha";
-	mes "That little rookie was knocked out by my one blow!";
-	next;
-	mes "[Sludge Worm]";
-	mes "Those arrogant fellows deserve a bitter lesson.";
-	mes "How dare a little rookie attack my boss!";
-	next;
-	mes "[King Crab]";
-	mes "Khhha ha ha ha ha ha!!!!";
-	mes "One more cup of beer, here!!!";
-	mes "I will drink today!!!";
-	next;
-	mes "[Sludge Worm]";
-	mes "King Crab!!! I will follow you forever!!";
-	close;
 }
+ve_in,241,128,4	duplicate(King Crab#job_shu)	Sludge Worm#job_shu	110
 
 ve_in,244,126,3	script	Waitress#job_shu	69,{
-	if (job_shu == 0){
-		mes "[Waitress]";
+	mes "[Waitress]";
+	if (job_shu == 0) {
 		mes "Oh no~";
 		mes "I hate those noisy and impolite customers!";
 		mes "I hope there is someone who can scold them for me.";
 		close;
-	}else if (job_shu == 1){
-		if (Class == Job_Monk || Job_Baby_Monk){
-			mes "[Waitress]";
+	} else if (job_shu == 1) {
+		if (BaseJob == Job_Monk) {
 			mes "Oh dear~";
-			mes "I really appreciate you, Monk, for helping me a while ago.";
-			next;
-		}else if (Class == Job_Champion){
-			mes "[Waitress]";
-			mes "Oh dear~";
-			mes "I really appreciate you, Champion, for helping me a while ago.";
+			mes "I really appreciate you, "+jobname(Class)+", for helping me a while ago.";
 			next;
 		}
-		mes "[Waitress]";
 		mes "Ah, the person we saw before?";
 		mes "She has been staying in this village for days,";
 		mes "Isn't she so great?";
@@ -368,7 +188,6 @@ ve_in,244,126,3	script	Waitress#job_shu	69,{
 		mes "If you still don't know where to stay, please use ^f57d7dthe Inn at the upper side of this building^000000.";
 		close;
 	}
-	mes "[Waitress]";
 	mes "Now that the customers have become a little quiet.";
 	mes "Ahhhh, I feel better now!!";
 	close;
@@ -376,72 +195,68 @@ ve_in,244,126,3	script	Waitress#job_shu	69,{
 
 ve_in,240,131,0	script	???#bcmd	484,{
 	end;
-
 OnInit:
 	disablenpc "???#bcmd";
 	end;
-
 OnEnable:
 	enablenpc "???#bcmd";
 	initnpctimer;
 	end;
-
 OnDisable:
 	disablenpc "???#bcmd";
 	stopnpctimer;
 	end;
-
 OnTimer600000:
 	donpcevent "???#bcmd::OnDisable";
 	stopnpctimer;
 	end;
 }
 
-// Custom Translation NPC name
-ve_in,97,149,0	script	Sura Hotel	111,3,3,{
+ve_in,97,149,0	script	#Suraryokan	139,3,3,{
 OnTouch:
-	if (job_shu == 1){
+	if (job_shu == 1) {
+		set .@n$, "["+strcharinfo(0)+"]";
 		mes "[???]";
 		mes "Who is it?!";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes .@n$;
 		mes "I am the person who was at the pub a while ago.";
 		mes "I have something to ask.";
 		next;
 		mes "[???]";
 		mes "Don't bother me, just go away!";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes .@n$;
 		mes "Please, I just want to talk.";
 		next;
 		mes "[???]";
 		mes "...";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes .@n$;
 		mes "Don't ignore me, just talk to me.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes .@n$;
 		mes "Just for a moment, isn't it okay?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes .@n$;
 		mes "I'm not here to hurt you.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes .@n$;
 		mes "How could you treat someone who came to your door so badly?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes .@n$;
 		mes "You're going too far.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes .@n$;
 		mes "After I saw you fighting...";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes .@n$;
 		mes "I thought that you must have practiced martial arts and I came here to meet you.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes .@n$;
 		mes "But seeing that you stood me up outside like this...";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes .@n$;
 		mes "You must be advanced in martial arts...";
 		next;
 		mes "[???]";
@@ -456,12 +271,12 @@ OnTouch:
 }
 
 ve_in,98,159,0	script	Fighter#job_shu	484,{
-	if (job_shu < 2){
+	if (job_shu < 2) {
 		mes "[Fighter]";
 		mes "Ahhhh~ I'm so tired.";
 		mes "Training is so tough and I have a long way to go!";
 		close;
-	}else if (job_shu == 2){
+	} else if (job_shu == 2) {
 		mes "["+strcharinfo(0)+"]";
 		mes "I want to know about the skill you used a while ago.";
 		next;
@@ -535,7 +350,7 @@ ve_in,98,159,0	script	Fighter#job_shu	484,{
 		mes "You won't even have time to take a rest if you choose this way.";
 		mes "You'll become a puppet for war...";
 		next;
-		switch(select("But I still want to know more.:Well, I quit then.")){
+		switch(select("But I still want to know more.:Well, I quit then.")) {
 		case 1:
 			mes "[???]";
 			mes "Aren't you an idiot?";
@@ -562,8 +377,8 @@ ve_in,98,159,0	script	Fighter#job_shu	484,{
 			mes "You don't need to look for trouble.";
 			close;
 		}
-	}else if (job_shu == 3){
-		if (checkquest(11156,2) == 2){
+	} else if (job_shu == 3) {
+		if (checkquest(11156,HUNTING) == 2) {
 			mes "[???]";
 			mes "Wow~";
 			mes "Did you really kill all those wolves?";
@@ -590,7 +405,7 @@ ve_in,98,159,0	script	Fighter#job_shu	484,{
 		mes "Okay, then^f57d7d go and kill 100 Desert Wolves.^000000";
 		mes "Then I'll think about it again.";
 		close;
-	}else if (job_shu == 4){
+	} else if (job_shu == 4) {
 		mes "[Bruno]";
 		mes "Go to ^f57d7dEl Mes Gorge Southeast of Juno^000000.";
 		mes "My colleague ^f57d7dBuddy^000000 will be training himself near the center of that area.";
@@ -598,7 +413,7 @@ ve_in,98,159,0	script	Fighter#job_shu	484,{
 		mes "[Bruno]";
 		mes "Tell him that 'Bruno' sent you there and after that, just suit yourself.";
 		close;
-	}else if (job_shu == 100){
+	} else if (job_shu == 100) {
 		mes "[Bruno]";
 		mes "Hey~ !";
 		mes "How are you doing?";
@@ -617,15 +432,15 @@ ve_in,98,159,0	script	Fighter#job_shu	484,{
 	close;
 }
 
-yuno_fild07,254,176,7	script	Buddy#job_shu	483,{
-	if (job_shu < 4){
+yuno_fild07,254,176,7	script	Buddy#job_shu	753,{
+	if (job_shu < 4) {
 		mes "[Buddy]";
 		mes "Haaap!!! Haaaap!!! Whoo!! Haahhp!!!";
 		next;
 		mes "[Buddy]";
 		mes "I don't know why you're here but please don't stand behind me unless you want to die.";
 		close;
-	}else if (job_shu == 4){
+	} else if (job_shu == 4) {
 		mes "[Buddy]";
 		mes "Haaap!!! Haaaap!!! Whoo!! Haahhp!!!";
 		next;
@@ -647,7 +462,7 @@ yuno_fild07,254,176,7	script	Buddy#job_shu	483,{
 		mes "You must be a special person for her to send you to me.";
 		next;
 		mes "[Buddy]";
-		mes "Well, I can't answer your question because I'm in the process of self training, so I will take you to our master.";
+		mes "Well, I can't answer your question because I'm in the process of self-training, so I will take you to our master.";
 		next;
 		mes "[Buddy]";
 		mes "My master doesn't like noise, so please ^f57d7dwait in the living room silently.^000000";
@@ -659,25 +474,27 @@ yuno_fild07,254,176,7	script	Buddy#job_shu	483,{
 		close2;
 		warp "sword_1-1",215,244;
 		end;
-	}else if (job_shu == 100){
+	} else if (job_shu == 100) {
 		mes "[Buddy]";
 		mes "Ah, long time no see, "+strcharinfo(0)+".";
 		mes "Are you here to meet my master?";
 		next;
-		if (select("Yes:No") == 1){
+		switch(select("Yes:No")) {
+		case 1:
 			mes "[Buddy]";
 			mes "I'll take you right away.";
 			close2;
 			warp "sword_1-1",216,168;
 			end;
+		case 2:
+			mes "[Buddy]";
+			mes "Then, why are you here?";
+			mes "You are not here to see me, aren't you?";
+			close;
 		}
-		mes "[Buddy]";
-		mes "Then, why are you here?";
-		mes "You are not here to see me, aren't you?";
-		close;
 	}
 	mes "[Buddy]";
-	mes ""+strcharinfo(0)+"£¬Didn't you meet the master yet?";
+	mes strcharinfo(0)+", didn't you meet the master yet?";
 	next;
 	mes "[Buddy]";
 	mes "My master doesn't like noise, so please ^f57d7dwait in the living room silently.^000000";
@@ -689,109 +506,94 @@ yuno_fild07,254,176,7	script	Buddy#job_shu	483,{
 	end;
 }
 
-sword_1-1,223,243,4	script	Drawing Room	111,{
+sword_1-1,223,243,4	script	Drawing Room	753,{
 	end;
-	
 OnInit:
 	waitingroom "Drawing Room",20,"Drawing Room::OnStartArena",1;
 	enablewaitingroomevent;
 	end;
-
 OnStartArena:
 	warpwaitingpc "sword_2-1",223,205;
 	donpcevent "Buddy#Sura_Salon::OnEnable";
 	disablewaitingroomevent;
 	end;
-
 OnEnable:
 	enablewaitingroomevent;
 	end;
-
 OnDisable:
 	disablewaitingroomevent;
 	end;
 }
 
-sword_1-1,223,243,4	script	Buddy#job_shu reception	483,{
+sword_1-1,223,243,4	script	Buddy#job_shu_Salong	753,{
 	mes "[Buddy]";
 	mes "My master doesn't like noise, so please ^f57d7dwait in the living room silently.^000000";
 	next;
-	if (select("Go to the living room.:Go outside.") == 1){
+	switch(select("Go to the living room.:Go outside.")) {
+	case 1:
 		mes "[Buddy]";
 		mes "Please wait in the living room at the upper side.";
 		close;
+	case 2:
+		mes "[Buddy]";
+		mes "Then, see you again.";
+		close2;
+		warp "yuno_fild07",255,178;
+		end;
 	}
-	mes "[Buddy]";
-	mes "Then, see you again.";
-	close2;
-	warp "yuno_fild07",255,178;
-	end;
 }
 
 sword_2-1,1,1,0	script	Buddy#Sura_Salon	66,{
 	end;
-
 OnInit:
 	disablenpc "Buddy#Sura_Salon";
 	end;
-
 OnEnable:
 	enablenpc "Buddy#Sura_Salon";
 	initnpctimer;
 	end;
-
 OnReset:
 	killmonster "sword_2-1","Buddy#Sura_Salon::OnMyMobDead";
 	end;
-
 OnDisable:
 	disablenpc "Buddy#Sura_Salon";
 	stopnpctimer;
 	end;
-
 OnMyMobDead:
-	if(.MyMobCount < 1){
-		monster "sword_2-1",219,210,"hallucination",1479,1,"Buddy#Sura_Salon::OnMyMobDead";
-		monster "sword_2-1",228,209,"hallucination",1483,1,"Buddy#Sura_Salon::OnMyMobDead";
-		monster "sword_2-1",228,201,"hallucination",1479,1,"Buddy#Sura_Salon::OnMyMobDead";
-		monster "sword_2-1",219,201,"hallucination",1483,1,"Buddy#Sura_Salon::OnMyMobDead";
+	if (mobcount("sword_2-1","Buddy#Sura_Salon::OnMyMobDead") < 1) {
+		monster "sword_2-1",219,210,"Hallucination",1479,1,"Buddy#Sura_Salon::OnMyMobDead";
+		monster "sword_2-1",228,209,"Hallucination",1483,1,"Buddy#Sura_Salon::OnMyMobDead";
+		monster "sword_2-1",228,201,"Hallucination",1479,1,"Buddy#Sura_Salon::OnMyMobDead";
+		monster "sword_2-1",219,201,"Hallucination",1483,1,"Buddy#Sura_Salon::OnMyMobDead";
 	}
 	end;
-
 OnTimer3000:
 	mapannounce "sword_2-1","The master is now in the middle of training, and you need to wait in the living room around 5 minutes.",bc_map;
 	end;
-
 OnTimer4000:
 	mapannounce "sword_2-1","Ah! You may have hallucinations in the living room, so please be careful.",bc_map;
 	end;
-
 OnTimer5000:
 	mapannounce "sword_2-1","This is the policy of the master, so please don't feel unpleasant.",bc_map;
 	end;
-
 OnTimer33000:
-	monster "sword_2-1",219,210,"hallucination",1480,1,"Buddy#Sura_Salon::OnMyMobDead";
+	monster "sword_2-1",219,210,"Hallucination",1480,1,"Buddy#Sura_Salon::OnMyMobDead";
 	monster "sword_2-1",219,210,"It can't be true",1479,1,"Buddy#Sura_Salon::OnMyMobDead";
-	monster "sword_2-1",228,209,"hallucination",1446,1,"Buddy#Sura_Salon::OnMyMobDead";
+	monster "sword_2-1",228,209,"Hallucination",1446,1,"Buddy#Sura_Salon::OnMyMobDead";
 	monster "sword_2-1",228,209,"Just Imagination",1483,1,"Buddy#Sura_Salon::OnMyMobDead";
-	monster "sword_2-1",228,201,"hallucination",1480,1,"Buddy#Sura_Salon::OnMyMobDead";
+	monster "sword_2-1",228,201,"Hallucination",1480,1,"Buddy#Sura_Salon::OnMyMobDead";
 	monster "sword_2-1",228,201,"Illusion",1479,1,"Buddy#Sura_Salon::OnMyMobDead";
-	monster "sword_2-1",219,201,"hallucination",1446,1,"Buddy#Sura_Salon::OnMyMobDead";
+	monster "sword_2-1",219,201,"Hallucination",1446,1,"Buddy#Sura_Salon::OnMyMobDead";
 	monster "sword_2-1",219,201,"Just Imagination",1483,1,"Buddy#Sura_Salon::OnMyMobDead";
-	set .MyMobCount,8;
 	end;
-
 OnTimer93000:
-	monster "sword_2-1",219,210,"hallucination",1480,1,"Buddy#Sura_Salon::OnMyMobDead";
+	monster "sword_2-1",219,210,"Hallucination",1480,1,"Buddy#Sura_Salon::OnMyMobDead";
 	monster "sword_2-1",219,210,"Just Imagination",1479,1,"Buddy#Sura_Salon::OnMyMobDead";
-	monster "sword_2-1",228,209,"hallucination",1446,1,"Buddy#Sura_Salon::OnMyMobDead";
-	monster "sword_2-1",228,209,"hallucination",1483,1,"Buddy#Sura_Salon::OnMyMobDead";
-	monster "sword_2-1",228,201,"hallucination",1480,1,"Buddy#Sura_Salon::OnMyMobDead";
-	monster "sword_2-1",219,201,"hallucination",1446,1,"Buddy#Sura_Salon::OnMyMobDead";
-	set .MyMobCount,6;
+	monster "sword_2-1",228,209,"Hallucination",1446,1,"Buddy#Sura_Salon::OnMyMobDead";
+	monster "sword_2-1",228,209,"Hallucination",1483,1,"Buddy#Sura_Salon::OnMyMobDead";
+	monster "sword_2-1",228,201,"Hallucination",1480,1,"Buddy#Sura_Salon::OnMyMobDead";
+	monster "sword_2-1",219,201,"Hallucination",1446,1,"Buddy#Sura_Salon::OnMyMobDead";
 	end;
-
 OnTimer153000:
 	mapannounce "sword_2-1","If you're bored, may I bring you some magazines?",bc_map;
 	monster "sword_2-1",219,210,"Magazine",1478,1,"Buddy#Sura_Salon::OnMyMobDead";
@@ -802,110 +604,88 @@ OnTimer153000:
 	monster "sword_2-1",228,201,"Magazine",1478,1,"Buddy#Sura_Salon::OnMyMobDead";
 	monster "sword_2-1",219,201,"Magazine",1478,1,"Buddy#Sura_Salon::OnMyMobDead";
 	monster "sword_2-1",219,201,"Magazine",1478,1,"Buddy#Sura_Salon::OnMyMobDead";
-	set .MyMobCount,8;
 	end;
-
 OnTimer213000:
-	monster "sword_2-1",219,210,"hallucination",1480,1,"Buddy#Sura_Salon::OnMyMobDead";
+	monster "sword_2-1",219,210,"Hallucination",1480,1,"Buddy#Sura_Salon::OnMyMobDead";
 	monster "sword_2-1",219,210,"Never mind",1479,1,"Buddy#Sura_Salon::OnMyMobDead";
-	monster "sword_2-1",228,209,"hallucination",1483,1,"Buddy#Sura_Salon::OnMyMobDead";
-	monster "sword_2-1",228,201,"hallucination",1480,1,"Buddy#Sura_Salon::OnMyMobDead";
+	monster "sword_2-1",228,209,"Hallucination",1483,1,"Buddy#Sura_Salon::OnMyMobDead";
+	monster "sword_2-1",228,201,"Hallucination",1480,1,"Buddy#Sura_Salon::OnMyMobDead";
 	monster "sword_2-1",228,201,"Can you see me?",1479,1,"Buddy#Sura_Salon::OnMyMobDead";
-	monster "sword_2-1",219,201,"hallucination",1483,1,"Buddy#Sura_Salon::OnMyMobDead";
-	set .MyMobCount,6;
+	monster "sword_2-1",219,201,"Hallucination",1483,1,"Buddy#Sura_Salon::OnMyMobDead";
 	end;
-
 OnTimer273000:
 	monster "sword_2-1",219,210,"",1480,1,"Buddy#Sura_Salon::OnMyMobDead";
-	monster "sword_2-1",228,209,"hallucination",1446,1,"Buddy#Sura_Salon::OnMyMobDead";
-	monster "sword_2-1",228,201,"hallucination",1480,1,"Buddy#Sura_Salon::OnMyMobDead";
-	monster "sword_2-1",228,201,"hallucination",1479,1,"Buddy#Sura_Salon::OnMyMobDead";
-	monster "sword_2-1",219,201,"hallucination",1446,1,"Buddy#Sura_Salon::OnMyMobDead";
-	monster "sword_2-1",219,201,"hallucination",1483,1,"Buddy#Sura_Salon::OnMyMobDead";
-	set .MyMobCount,6;
+	monster "sword_2-1",228,209,"Hallucination",1446,1,"Buddy#Sura_Salon::OnMyMobDead";
+	monster "sword_2-1",228,201,"Hallucination",1480,1,"Buddy#Sura_Salon::OnMyMobDead";
+	monster "sword_2-1",228,201,"Hallucination",1479,1,"Buddy#Sura_Salon::OnMyMobDead";
+	monster "sword_2-1",219,201,"Hallucination",1446,1,"Buddy#Sura_Salon::OnMyMobDead";
+	monster "sword_2-1",219,201,"Hallucination",1483,1,"Buddy#Sura_Salon::OnMyMobDead";
 	end;
-
 OnTimer300000:
 	mapannounce "sword_2-1","The master has arrived. Soon I'll show you into the master's room.",bc_map;
 	end;
-
 OnTimer303000:
 	donpcevent "Buddy#job_shuaneh::OnEnable";
 	end;
-
 OnTimer305000:
 	donpcevent "Buddy#Sura_Salon::OnReset";
 	end;
-
 OnTimer315000:
 	mapannounce "sword_2-1","Come on here.",bc_map;
 	donpcevent "Buddy#job_shuaneh::OnDisable";
-	donpcevent "Sura_garajjom::OnEnable";
+	donpcevent "#Sura_garajjom::OnEnable";
 	end;
-
 OnTimer320000:
-	mapannounce "sword_2-1","I guess you're not ready to meet the master yet..",bc_map;
-	donpcevent "Sura_garajjom::OnDisable";
+	mapannounce "sword_2-1","I guess you're not ready to meet the master yet...",bc_map;
+	donpcevent "#Sura_garajjom::OnDisable";
 	donpcevent "Drawing Room::OnEnable";
 	mapwarp "sword_2-1","yuno_fild07",255,178;
 	stopnpctimer;
 	end;
 }
 
-sword_2-1,223,205,7	script	Buddy#job_shuaneh	483,{
-	if (job_shu > 4){
+sword_2-1,223,205,7	script	Buddy#job_shuaneh	753,{
+	if (job_shu > 4) {
 		mes "I'll show you the way. This way.";
 		close2;
 		warp "sword_1-1",216,168;
 		donpcevent "Buddy#job_shuaneh::OnDisable";
 		end;
 	}
-	// Custom Translation
-	mes "How did you get here?";
+	mes "Why are you here?";
 	close2;
 	warp "yuno_fild07",248,179;
 	end;
-
 OnInit:
+OnDisable:
 	disablenpc "Buddy#job_shuaneh";
 	end;
-
 OnEnable:
 	enablenpc "Buddy#job_shuaneh";
 	end;
-
-OnDisable:
-	disablenpc "Buddy#job_shuaneh";
-	end;
 }
 
-sword_2-1,223,205,0	script	Sura_garajjom	111,10,10,{
-	end;
-
+sword_2-1,223,205,0	script	#Sura_garajjom	139,10,10,{
 OnTouch:
 	warp "sword_1-1",216,168;
 	end;
-
 OnInit:
-	disablenpc "Sura_garajjom";
+OnDisable:
+	disablenpc "#Sura_garajjom";
 	end;
-
 OnEnable:
-	enablenpc "Sura_garajjom";
-	end;
-
-OnDisable:
-	disablenpc "Sura_garajjom";
+	enablenpc "#Sura_garajjom";
 	end;
 }
 
 sword_1-1,222,169,5	script	Bruno#job_shu	484,{
-	if (job_shu > 4){
+	if (job_shu > 4) {
 		mes "[Bruno]";
-		mes "Hey~ "+strcharinfo(0)+", What's up?";
+		mes "Hey~ "+strcharinfo(0)+", what's up?";
 		next;
-		if (select("Let's have conversation.:Go outside.") == 1){
-			if (job_shu == 100){
+		switch(select("Let's have conversation.:Go outside.")) {
+		case 1:
+			if (job_shu == 100) {
 				mes "[Bruno]";
 				mes "My master?";
 				mes "He said he has put the world out of his mind and he is a ghost who gave up being a human but he seems to have a lingering desire for the world.";
@@ -945,173 +725,91 @@ sword_1-1,222,169,5	script	Bruno#job_shu	484,{
 			mes "[Bruno]";
 			mes "We don't care about your age in our world!";
 			close;
+		case 2:
+			mes "[Bruno]";
+			mes "Come again whenever you want to~";
+			mes "I will show you the training course of the dead~";
+			close2;
+			warp "yuno_fild07",255,178;
+			end;
 		}
-		mes "[Bruno]";
-		mes "Come again whenever you want to~";
-		mes "I will show you the training course of the dead~";
-		close2;
-		warp "yuno_fild07",255,178;
-		end;
 	}
 	mes "[Bruno]";
-	// Custom Translation
-	mes "How do people keep";
-	mes "getting in here!";
-	mes "Get out!!!";
+	mes "What are you?";
+	mes "How did you find this place!";
+	mes "Go away!!!";
 	close2;
 	warp "yuno_fild07",255,178;
 	end;
 }
 
 sword_1-1,223,167,2	script	Master#job_shu	483,{
-	if (job_shu > 4){
-		if (job_shu == 5){
+	mes "[Master]";
+	if (job_shu == 5) {
+		mes "You must have bright eyes to see that you finally came to this room.";
+		next;
+		mes "[Master]";
+		if (SkillPoint != 0) {
+			mes "You can't become a Sura unless you use all your skill points.";
+			close;
+		}
+		if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
+			mes "You seem to be heavily burdened. Please remove some of it.";
+			close;
+		}
+		if (BaseLevel < 99 || JobLevel < 50) {
+			mes "You don't seem to have reached the limit of a human, you still have far to go in order to become Sura.";
+			mes "Please go practice some more.";
+			close;
+		}
+		if (BaseJob != Job_Monk) {
+			mes "Hmm?";
+			close;
+		}
+		mes "Of course~";
+		mes "I have keen eyes.";
+		next;
+		mes "[Bruno]";
+		mes "Master! This is a wolf fur coat.";
+		mes "Put it on when it's cold.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Ahhk! That is the wolf I... caught... Uhh.";
+		next;
+		mes "- Whack -";
+		next;
+		mes "[Bruno]";
+		mes "Ho ho ho~";
+		mes "Do you have something to say, "+strcharinfo(0)+"?";
+		mes "You became a member of our family, let's get along together ~";
+		next;
+		mes "[Master]";
+		mes "Right, I now accept you as my student, too.";
+		next;
+		mes "[Master]";
+		mes "I think you already know it, but to live as a Sura will not be that easy.";
+		next;
+		mes "[Master]";
+		mes "I also shut myself off from the world. If there comes a day when we go to the world again, it must be the day when the world needs ghosts for the wars.";
+		next;
+		mes "[Master]";
+		mes "I hope those days will not come but... I'll willingly be the ghost and kill all enemies.";
+		next;
+		if (ismounting()) {
 			mes "[Master]";
-			mes "You must have bright eyes to see that you finally came to this room.";
-			next;
-			if(SkillPoint != 0){
-				mes "[Master]";
-				// Custom Translation
-				mes "Please use all your Skill Points or you cannot become a Sura.";
-				close;
-			}
-			if(checkweight(1201,1) == 0){
-				mes "[Master]";
-				// Custom Translation
-				mes "Your earthly burden is to heavy. You'd better go clean up.";
-				close;
-			}
-			if (JobLevel < 50 || BaseLevel < 99){
-				mes "[Master]";
-				// Custom Translation
-				mes "You seem to have not yet reached the limits of human beings, you still have far to go in order to become Sura.";
-				mes "Go train more.";
-				close;
-			}
-			if (Class == Job_Baby_Monk){
-				mes "[Bruno]";
-				mes "Of course~";
-				mes "I have keen eyes.";
-				next;
-				mes "[Bruno]";
-				mes "Master! This is a wolf fur coat.";
-				mes "Put it on when it's cold.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Ahhk! That is the wolf I... caught... Uhh.";
-				next;
-				mes "- Whack -";
-				next;
-				mes "[Bruno]";
-				mes "Ho ho ho~";
-				mes "Do you have something to say, "+strcharinfo(0)+"?";
-				mes "You became a member of our family, let's get along together ~";
-				next;
-				mes "[Master]";
-				mes "Right, I now accept you as my student, too.";
-				next;
-				mes "[Master]";
-				mes "I think you already know it, but to live as a Sura will not be that easy.";
-				next;
-				mes "[Master]";
-				mes "I also shut myself off from the world. If there comes a day when we go to the world again, it must be the day when the world needs ghosts for the wars.";
-				next;
-				mes "[Master]";
-				mes "I hope those days will not come but... I'll willingly be the ghost and kill all enemies.";
-				next;
-				mes "[Master]";
-				mes "You should train yourself steadily until that day.";
-				set job_shu,100;
-				jobchange Job_Baby_Sura;
-				completequest 11158;
-				getitem 5754,1;
-				getitem 2795,1;
-				close;
-			}else if (Class == Job_Monk){
-				mes "[Bruno]";
-				mes "Of course~";
-				mes "I have keen eyes.";
-				next;
-				mes "[Bruno]";
-				mes "Master! This is a wolf fur coat.";
-				mes "Put it on when it's cold.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Ahhk! That is the wolf I... caught... Uhh.";
-				next;
-				mes "- Whack -";
-				next;
-				mes "[Bruno]";
-				mes "Ho ho ho~";
-				mes "Do you have something to say, "+strcharinfo(0)+"?";
-				mes "You became a member of our family, let's get along together ~";
-				next;
-				mes "[Master]";
-				mes "Right, I now accept you as my student, too.";
-				next;
-				mes "[Master]";
-				mes "I think you already know it, but to live as a Sura will not be that easy.";
-				next;
-				mes "[Master]";
-				mes "I also shut myself off from the world. If there comes a day when we go to the world again, it must be the day when the world needs ghosts for the wars.";
-				next;
-				mes "[Master]";
-				mes "I hope those days will not come but... I'll willingly be the ghost and kill all enemies.";
-				next;
-				mes "[Master]";
-				mes "You should train yourself steadily until that day.";
-				set job_shu,100;
-				jobchange Job_Sura;
-				completequest 11158;
-				getitem 5754,1;
-				getitem 2795,1;
-				close;
-			}else if (Class == Job_Champion){
-				mes "[Bruno]";
-				mes "Of course~";
-				mes "I have keen eyes.";
-				next;
-				mes "[Bruno]";
-				mes "Master! This is a wolf fur coat.";
-				mes "Put it on when it's cold.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Ahhk! That is the wolf I... caught... Uhh.";
-				next;
-				mes "- Whack -";
-				next;
-				mes "[Bruno]";
-				mes "Ho ho ho~";
-				mes "Do you have something to say, "+strcharinfo(0)+"?";
-				mes "You became a member of our family, let's get along together ~";
-				next;
-				mes "[Master]";
-				mes "Right, I now accept you as my student, too.";
-				next;
-				mes "[Master]";
-				mes "I think you already know it, but to live as a Sura will not be that easy.";
-				next;
-				mes "[Master]";
-				mes "I also shut myself off from the world. If there comes a day when we go to the world again, it must be the day when the world needs ghosts for the wars.";
-				next;
-				mes "[Master]";
-				mes "I hope those days will not come but... I'll willingly be the ghost and kill all enemies.";
-				next;
-				mes "[Master]";
-				mes "You should train yourself steadily until that day.";
-				set job_shu,100;
-				jobchange Job_Sura_T;
-				completequest 11155;
-				getitem 5754,1;
-				getitem 2795,1;
-				close;
-			}
-			mes "[Master]";;
-			// Custom Translation
-			mes "Ah?";;
+			mes "So... please get down from your riding pet!";
+			mes "It is a loss of etiquette on this situation.";
 			close;
 		}
 		mes "[Master]";
+		mes "You should train yourself steadily until that day.";
+		set job_shu,100;
+		jobchange roclass(eaclass()|EAJL_THIRD);
+		completequest 11158;
+		getitem 5754,1; //Blazing_Soul
+		getitem 2795,1; //Green_Apple_Ring
+		close;
+	} else if (job_shu > 5) {
 		mes "Once I was also an ordinary young man who traveled a lot and met many friends.";
 		next;
 		mes "[Master]";
@@ -1122,54 +820,48 @@ sword_1-1,223,167,2	script	Master#job_shu	483,{
 		next;
 		mes "[Master]";
 		mes "But what's done is done...";
-		if (countitem(6153) > 0){
-			delitem 6153,1;
-			getitem 5754,1;
-		}
 		close;
 	}
-	mes "[Master]";
-	mes "You should not have come here.";
-	mes "Please leave.";
+	mes "This is not a place where you can stay.";
+	mes "Please go back.";
 	close2;
 	warp "yuno_fild07",255,178;
 	end;
 }
 
 /*
-// Custom Translation
-sword_2-1,1,2,0	script	Sura Job Switch	66,{
-	switch(select("Open Arena:Close Arena:Activate Drawing Room:Actvate Buddy:Activate Naigara:All Off:Cancel")){
-		case 1:
-			mes "Opening Arena";
-			donpcevent "Drawing Room::OnEnable";
-			close;
-		case 2:
-			mes "Closing Arena";
-			donpcevent "Drawing Room::OnDisable";
-			close;
-		case 3:
-			mes "Activating Drawing Room";
-			donpcevent "Buddy#Sura_Salon::OnEnable";
-			close;
-		case 4:
-			mes "Activating Buddy";
-			donpcevent "Buddy#job_shuaneh::OnEnable";
-			close;
-		case 5:
-			mes "Activating garajjom";
-			donpcevent "Sura_garajjom::OnEnable";
-			close;
-		case 6:
-			mes "Deactivating all.";
-			donpcevent "Drawing Room::OnDisable";
-			donpcevent "Buddy#Sura_Salon::OnReset";
-			donpcevent "Buddy#Sura_Salon::OnDisable";
-			donpcevent "Buddy#job_shuaneh::OnDisable";
-			donpcevent "Sura_garajjom::OnDisable";
-			close;
-		case 7:
-			close;
+sword_2-1,1,2,0	script	Button Girl#sura	66,{
+	switch(select("Turn on arena.:Turn off arena.:Turn on the living room.:Turn on Buddy.:Turn on Gara.:Turn off all.:Close")) {
+	case 1:
+		mes "Turn on arena.";
+		donpcevent "Drawing Room::OnEnable";
+		close;
+	case 2:
+		mes "Turn off arena.";
+		donpcevent "Drawing Room::OnDisable";
+		close;
+	case 3:
+		mes "Turn on the living room.";
+		donpcevent "Buddy#Sura_Salon::OnEnable";
+		close;
+	case 4:
+		mes "Turn on Buddy.";
+		donpcevent "Buddy#job_shuaneh::OnEnable";
+		close;
+	case 5:
+		mes "Turn on Gara.";
+		donpcevent "#Sura_garajjom::OnEnable";
+		close;
+	case 6:
+		mes "Turn off all.";
+		donpcevent "Drawing Room::OnDisable";
+		donpcevent "Buddy#Sura_Salon::OnReset";
+		donpcevent "Buddy#Sura_Salon::OnDisable";
+		donpcevent "Buddy#job_shuaneh::OnDisable";
+		donpcevent "#Sura_garajjom::OnDisable";
+		close;
+	case 7:
+		close;
 	}
 }
 */
\ No newline at end of file
diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt
index ea928ab7b..552c9d80b 100644
--- a/npc/re/jobs/3-2/wanderer.txt
+++ b/npc/re/jobs/3-2/wanderer.txt
@@ -1,5 +1,5 @@
 //===== rAthena Script ======================================= 
-// Wanderer Job change Quest
+//= Wanderer Job Quest
 //===== By: ================================================== 
 //= Muad_Dib, Meyraw
 //===== Current Version: =====================================