2-x quest skill update 1/2.

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

6 files changed, 4082 insertions, 1838 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index a303b488a..6b458f2a3 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2007/10/23
+	* Rev. 11563 2-x quest skill update 1/2. [L0ne_W0lf]
 	* Rev. 11562 Small fix for the turbo track point converter. [L0ne_W0lf]
 2007/10/22
 	* Rev. 11553 Another small update to the mail npcs. [L0ne_W0lf]
diff --git a/npc/quests/skills/alchemist_skills.txt b/npc/quests/skills/alchemist_skills.txt
index a19f66f71..1fa472e0f 100644
--- a/npc/quests/skills/alchemist_skills.txt
+++ b/npc/quests/skills/alchemist_skills.txt
@@ -3,1186 +3,1163 @@
 //===== By: ================================================== 
 //= Lupus, Reddozen, Samuray22
 //===== Current Version: ===================================== 
-//= 1.8a
+//= 1.9
 //===== Compatible With: ===================================== 
-//= eAthena Revision 3800+
+//= eAthena SVN
 //===== Description: ========================================= 
-//= Temp quests for new skills for 2nd classes
+//= [Aegis COnversion]
+//= Quests for item: Elemental_Create_Book
 //===== Additional Comments: ================================= 
-//= 1.0 for fully working skills only [Lupus]
-//= 1.1 Added more new skill quests for more classes [Lupus]
-//= Somehow eA engine doesn't let you keep learn't skill V_V'
-//= 1.2 Added to correct locations, correct NPC's, fixed
-//= some of the items required and made them into real
-//= quests. [Reddozen] 
-//= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
-//= 1.3a fixed an item ID typo, thx 2Spiritual Kid
-//= 1.3b Splitted into different files [DracoRPG]
-//= 1.4 Added Creators + Baby Alchemists can pass Bio Ethics
-//= 	Quest too [Lupus]
-//= 1.5 Removed duplicates [Toms] 1.5a fixed typo [Lupus]
-//= 1.6 Moved some NPCs related to Lighthalzen quests. [SinSloth]
-//= 1.7 Updated "Elemental Potion Creation Quest" to the official one. [Samuray22]
-//= 1.8 Added some missing NPCs from the Laboratory. [Samuray22]
-//= 1.8a replaced item "names" with item id [Lupus]
+//= 1.9 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //============================================================
 
-
-//============================================================
-// ALCHEMIST - ELEMENTAL POTION CREATION
-//============================================================
-yuno_in04,33,108,6	script	Pisruik Quv	883,{
-	if (Class == Job_Alchemist || Class == Job_Creator) {
-		if (JobLevel < 40 && Class == Job_Alchemist) {
+yuno_in04,33,108,4	script	Pisruik#qsk_al	883,{
+	if (BaseJob == Job_Alchemist) {
+		if (JobLevel < 40) {
 			mes "[Pisruik]";
-			mes "Achoo!";
-			mes "Sigh";
-			mes "I can't afford the medicine..";
-			mes "You need Job level 40!";
+			mes "^333333*Cough cough*^000000";
+			mes "Damn, if only I had";
+			mes "a little more money";
+			mes "to buy some medicine.";
+			mes "I should have stayed";
+			mes "home today, but...";
 			close;
-		} else if(ALCHE_SK == 0) {
+		}
+		if (ALCHE_SK == 0) {
+			mes "[Pisruik]";
+			mes "^333333*Cough cough*^000000";
+			mes "Ugh, there's nothing";
+			mes "worse than working when";
+			mes "you're supposed to be resting.";
+			mes "H-hey! Um, what are you doing?";
+			set ALCHE_SK,1;
+			next;
 			mes "[Pisruik]";
-			mes "Achoo!~";
-			mes "Mixing chemical is so fun~ Achoo!";
-			mes "Oi?";
-			mes "What are you doing looking at other people's experiments!";
-			set ALCHE_SK, 1;
+			mes "Q-quit looking at";
+			mes "my test results right";
+			mes "this inst--oh. Wait.";
+			mes "You're not one of the";
+			mes "researchers here. Huh.";
 			next;
 			mes "[Pisruik]";
-			mes "Kids these days..";
-			mes "Sigh..";
+			mes "Uh... Don't you have";
+			mes "anything better to do";
+			mes "than to breathe down my";
+			mes "back? I'm trying to finish";
+			mes "something here! Oh, never";
+			mes "mind, I'm just cranky...";
 			close;
-		} else if(ALCHE_SK == 1) {
+		}
+		else if (ALCHE_SK == 1) {
 			mes "[Pisruik]";
-			mes "Hey you are back!";
-			mes "Hmm... it doesn't look like";
-			mes "you are here to steal work";
-			mes "what bring you to ";
-			mes "places like this?";
+			mes "You again? You don't seem";
+			mes "to be doing any research here.";
+			mes "Is there something you need?";
+			mes "Though, I'm afraid I can't be";
+			mes "of very much help to you.";
 			next;
-			switch( select( "What kind of experiment are you conducting?", "Im...well...")) {
-			case 1:
+			if (select("What are you working on?:I don't need anything, thanks.") == 1) {
 				mes "[Pisruik]";
-				mes "Can't you tell?";
-				mes "...I guess its no use.";
-				mes "Do you remember how I yelled";
-				mes "last time because you were looking at my work?";
+				mes "Well, I'm not sure if I can";
+				mes "give you all of the details.";
+				mes "You see, everyone here is";
+				mes "a researcher that can't afford";
+				mes "to rent a lab for himself. So we all ended up sharing this one.";
 				next;
 				mes "[Pisruik]";
-				mes "As you can see, this is a shared laboratory.";
-				mes "It's for poor scientists";
-				mes "who can't afford a private lab";
-				mes "We pay a set amount of money to rent";
-				mes "a part of the laboratory";
-				mes "..and I'm one of them.";
+				mes "Even though we all pitched";
+				mes "in to rent this lab, we're all";
+				mes "getting pretty desperate. In";
+				mes "fact, a few of us have even";
+				mes "stolen work from each other.";
+				mes "That's pretty pathetic, huh?";
 				next;
 				mes "[Pisruik]";
-				mes "Because the space is shared by so many, its scary here.";
-				mes "There are people here who stole work from others";
-				mes "and published them,";
-				mes "and... it gets even worse. But";
-				mes "since we are all poor, we can't do much about it.";
+				mes "I guess that's what happens";
+				mes "when you're poor and don't";
+				mes "have a day job. Things are";
+				mes "so bad right now, I can't even";
+				mes "afford to get new materials!";
+				mes "What can I possibly do?";
 				next;
 				mes "[Pisruik]";
-				mes "Its not like we have";
-				mes "other means of earning money,";
-				mes "like that alchemist from far, far away";
-				mes "who can earn money by";
-				mes "selling items to villagers.";
+				mes "Ah, I've got it! You're";
+				mes "an adventurer, right?";
+				mes "If you're still curious about";
+				mes "my research, I'll tell you more";
+				mes "about it if you help me out by";
+				mes "gathering some supplies for me.";
 				next;
 				mes "[Pisruik]";
-				mes "Items...";
-				mes "Oh, I know";
-				mes "You are an adventurer right?";
-				mes "What's your name?";
+				mes "I guess it couldn't do";
+				mes "much harm if you knew what";
+				mes "I was working on, anyway.";
+				mes "I mean, we'd have to be working";
+				mes "on the same project for you to";
+				mes "benefit. So, what's your name?";
 				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "I am "+strcharinfo(0)+"...";
+				mes "["+ strcharinfo(0) +"]";
+				mes "I am called "+ strcharinfo(0) +".";
 				next;
+				set ALCHE_SK,2;
 				mes "[Pisruik]";
-				mes "If you can get me";
-				mes "some items I need for experiments,";
-				mes "I'll tell you what I'm making";
-				mes "Since I know that we won't be doing";
-				mes "experiments in the same area..";
-				next;
-				set ALCHE_SK, 2;
-				mes "[Pisruik]";
-				mes "Thing that I need right now are,";
-				mes "5 Yellow Gemstones,";
-				mes "4 Empty Potion Bottle,";
-				mes "10 Heart of Mermaid,";
-				mes "10 Powder of Butterfly.";
-				mes "So come back when you've got the items.";
-				close;
-			case 2:
-				mes "[Pisruik]";
-				mes "You can buy them at the toolshop.";
-				mes "Things in here are all";
-				mes "personal properties.";
+				mes "Ah, "+ strcharinfo(0) +".";
+				mes "Would you please bring";
+				mes "^6600005 Yellow Gemstones^000000,";
+				mes "^6600004 Empty Potion Bottles^000000,";
+				mes "^66000010 Hearts of Mermaids^000000,";
+				mes "and ^66000010 Moth Dust^000000?";
 				close;
 			}
-		} else if(ALCHE_SK == 2) {
 			mes "[Pisruik]";
-			mes "Hey, "+strcharinfo(0)+"";
-			mes "The items that I asked for are...";
-			mes "4 Empty Potion Botles";
-			mes "and... er....";
-			mes "What were they again?";
+			mes "If you came here to buy";
+			mes "Potion Manuals or something";
+			mes "like that, you've come to the";
+			mes "wrong guy. Everything you see";
+			mes "here is for the completion";
+			mes "of a personal project.";
+			close;
+		}
+		else if (ALCHE_SK == 2) {
+			mes "[Pisruik]";
+			mes "Great you're back!";
+			mes "Let's see, you were";
+			mes "supposed to bring me";
+			mes "4 Empty Potion Bottles...";
+			mes "And... And... What else";
+			mes "did I ask you to get?";
 			next;
-			switch( select( "5 Yellow Gemstones,", "5 Blue Gemstones,", "5 Red Gemstones,")) {
+			switch(select("5 Yellow Gemstones:5 Blue Gemstones:5 Red Gemstones")) {
 			case 1:
 				mes "[Pisruik]";
-				mes "5 Yellow Gemstones";
-				mes "And...";
+				mes "Right, right!";
+				mes "5 Yellow Gemstones.";
+				mes "That's what I needed.";
+				mes "I'm sure there was more,";
+				mes "but what I can't recall exactly... ^FFFFFF ^000000";
 				next;
-				switch( select( "10 Heart of Mermaid,", "10 Large Jellopy,")) {
-				case 1:
+				if (select("10 Hearts of Mermaid:10 Large Jellopies") == 1) {
 					mes "[Pisruik]";
-					mes "10 Heart of Mermaid";
-					mes "And...";
+					mes "Of course!";
+					mes "10 Hearts of Mermaid!";
+					mes "How could I forget that?";
+					mes "And then, the last thing";
+					mes "I asked you for was, um...";
 					next;
-					switch( select( "10 Snake Scales.", "10 Powders of Butterfly")) {
-					case 1:
+					if (select("10 Frill:10 Moth Dust") == 1) {
+						mes "[Pisruik]";
+						mes "No, that can't have";
+						mes "been it. I already have";
+						mes "plenty of Frills. Hmmm...";
+						mes "What am I missing now?";
+						close;
+					}
+					mes "[Pisruik]";
+					mes "Right. I was just";
+					mes "about to say that.";
+					mes "So did you remember";
+					mes "to bring me everything?";
+					next;
+					if (select("No.:Yes!") == 1) {
+						if (rand(1,5) == 1) {
+							mes "[Pisruik]";
+							mes "You didn't...?";
+							mes "Oh, just admit it.";
+							mes "You don't want to";
+							mes "do this for me, right?";
+							mes "Don't go wasting your";
+							mes "time just for my sake.";
+							close;
+						}
 						mes "[Pisruik]";
-						mes "Hmmmm no I don't really need that.";
-						mes "I have a friend who gave me a bunch";
-						mes "and I still have some left...";
-						mes "What was it?";
+						mes "Not yet, huh?";
+						mes "Though I hope you can";
+						mes "bring me that stuff as";
+						mes "soon as possible, you";
+						mes "don't have to do it, you";
+						mes "know. Yeah, no big deal.";
 						close;
-					case 2:
+					}
+					mes "[Pisruik]";
+					mes "Really now?";
+					mes "Well, let me check";
+					mes "what you brought to";
+					mes "make sure you didn't";
+					mes "forget anything. Hm...";
+					next;
+					if (countitem(715) > 4 && countitem(1093) > 3 && countitem(950) > 9 && countitem(1057) > 9) {
+						delitem 715,5; //Yellow_Gemstone
+						delitem 1093,4; //Empty_Potion
+						delitem 950,10; //Heart_Of_Mermaid
+						delitem 1057,10; //Moth_Dust
+						set ALCHE_SK,3;
 						mes "[Pisruik]";
-						mes "Yes ,";
-						mes "5 Yellow Gemstones,";
-						mes "4 Empty Potion Bottle,";
-						mes "10 Heart of Mermaid,";
-						mes "10 Powder of Butterfly.";
-						mes "Do you have all of them with you?";
+						mes "Great, it looks like";
+						mes "everything is here.";
+						mes "Alright, let me take";
+						mes "those. Now, guess what";
+						mes "I'll be making with the";
+						mes "materials you've brought.";
 						next;
-						switch( select( "No.", "Yes!")) {
+						switch(select("Medicine?:Bomb?")) {
 						case 1:
-							set .@fhit, rand(1,5);
-							if (.@fhit == 1) {
-								mes "[Pisruik]";
-								mes "If you don't want to do it then tell me.";
-								mes "I'm a busy person too!";
-								close;
-							}
-								mes "[Pisruik]";
-								mes "Hmmm...";
-								mes "If you can, please hurry.";
-								mes "Well, you don't have to do this, you know...";
-								close;
+							set ALCHE_SK,4;
+							mes "[Pisruik]";
+							mes "Hahahah, that's right!";
+							mes "I'm working on making";
+							mes "a new form of medicine.";
+							break;
+						case 2:
+							set ALCHE_SK,4;
+							mes "[Pisruik]";
+							mes "A bomb? Do I look like";
+							mes "a nutcase to you? No, no...";
+							mes "I'm developing a new form of";
+							mes "medicine. Sure, bombs make";
+							mes "good money, but where would";
+							mes "I test them? Here? No way!";
+							break;
+						}
+						next;
+						mes "[Pisruik]";
+						mes "Anyway, this medicine";
+						mes "reacts with the human body's";
+						mes "digestive enzymes to initiate";
+						mes "temporary metabolic changes";
+						mes "that artificially stop heat";
+						mes "absorption into the body.";
+						next;
+						mes "[Pisruik]";
+						mes "The actual effect of this";
+						mes "medicine is that it greatly";
+						mes "increases the body's resistance";
+						mes "to most forms of heat! However,";
+						mes "it will also reduce resistance";
+						mes "to cold as a side effect.";
+						next;
+						mes "[Pisruik]";
+						mes "I know my medicine sounds";
+						mes "a little weird, but think of";
+						mes "the applications! If used in";
+						mes "the right situations, this";
+						mes "medicine may be quite handy.";
+						next;
+						mes "[Pisruik]";
+						mes "Ah, seeing as you're still";
+						mes "here, would you mind helping";
+						mes "me again? I need about, hmm,";
+						mes "20 Maneater Blossoms. If you";
+						mes "could bring them to me, it'd";
+						mes "really help me out a lot.";
+						next;
+						switch(select("Nope, I'm too busy!:Sure, I'll help you.:What's in it for me?")) {
+						case 1:
+							set ALCHE_SK,5;
+							mes "[Pisruik]";
+							mes "I guess I'll have to gather";
+							mes "those on my own. Alright, well,";
+							mes "seeing as we've both gotten";
+							mes "what we wanted, I'll suppose";
+							mes "your business with me is done.";
+							close;
 						case 2:
+							set ALCHE_SK,6;
 							mes "[Pisruik]";
-							mes "Let's see...";
+							mes "Thanks, I really";
+							mes "appreciate it. While";
+							mes "I'm waiting for you,";
+							mes "I can start boiling";
+							mes "the Clover extract.";
 							next;
-							if (countitem(715) > 4 && countitem(1093) > 3 && countitem(950) > 9 && countitem(924) > 9) {
-								delitem 715, 5;
-								delitem 1093, 4;
-								delitem 950, 10;
-								delitem 924,10;
-								set ALCHE_SK, 3;
-								mes "[Pisruik]";
-								mes "Good.";
-								mes "It doesn't seem like they are in a bad shape...";
-								mes "Well I'll accept them.";
-								mes "Let's see.. hmm";
-								mes "What do you think I am making with all these?";
-								next;
-								switch( select( "Medicine?", "Bomb?")) {
-								case 1:
-									set ALCHE_SK, 4;
-									mes "[Pisruik]";
-									mes "Yes. It's medicine.";
-									goto Alc_Exp;
-								case 2:
-									set ALCHE_SK, 4;
-									mes "[Pisruik]";
-									mes "Bomb? Hahaha. No.";
-									mes "It's a medicine.";
-									next;
-									mes "[Pisruik]";
-									mes "Of course, I could earn a lot of money";
-									mes "by making bombs....BUT";
-									mes "I don't want to end up dead";
-									mes "because one of them blows up";
-									mes "while I'm making it.";
-									next;
-									mes "[Pisruik]";
-									mes "I just don't have";
-									mes "a good place to do experiments.";
-									mes "that's one of the reasons";
-									mes "why we can't make powerful bombs";
-									next;
-									mes "[Pisruik]";
-									mes "Well, not like I want to make it myself.";
-									next;
-									mes "[Pisruik]";
-								}
-							Alc_Exp:								
-								mes "You see,";
-								mes "If this medicine can react";
-								mes "in the body,";
-								next;
-								mes "[Pisruik]";
-								mes "The body's composition changes";
-								mes "very rapidly.";
-								mes "Let's see. For example,";
-								mes "if we are talking about high temperatures..";
-								mes "Originally, human body can't stand";
-								mes "high temperatures.";
-								next;
-								mes "[Pisruik]";
-								mes "Of course we can't stand in fire,";
-								mes "but the reason why when we get burnt";
-								mes "that part of skin dies, is because";
-								mes "a part of body which transports material";
-								mes "gets BBQ'ed and dies.";
-								next;
-								mes "[Pisruik]";
-								mes "It's the same reason why we die";
-								mes "from high fever.";
-								mes "The experiments I'm conducting right now";;
-								mes "will produce medicine";
-								mes "which will make us immune to";
-								mes "getting damaged by heat.";
-								next;
-								mes "[Pisruik]";
-								mes "But there are side effects.";
-								mes "You are going to be weak to";
-								mes "the opposite property.";
-								mes "Not like we can do much about it";
-								mes "since we are doing this mechanically";
-								next;
-								mes "[Pisruik]";
-								mes "'Creating' something implies";
-								mes "that you are ready to take responsibilities";
-								mes "of things that you didn't mean to do";
-								mes "but happens anyways..";
-								next;
-								mes "[Pisruik]";
-								mes "Anyways....";
-								mes "I am going to need one more favor...";
-								mes "because I need.. about 20 of";
-								mes "Maneater Blossom to perform experiments on.";
+							select("Clover extract? What's that for?");
+							mes "[Pisruik]";
+							mes "Well, I need the Clover";
+							mes "extract for a compound";
+							mes "that I'm going to make with";
+							mes "the Maneater Blossoms. I'm";
+							mes "kind of weak, so I try not to";
+							mes "travel too far when I can.";
+							next;
+							mes "[Pisruik]";
+							mes "Yeah, ever since I was";
+							mes "little, I've had a weak";
+							mes "heart and bad eyesight.";
+							mes "The doctor tells me to avoid";
+							mes "stress and hard work, but";
+							mes "researching is my life.";
+							if (Sex == 0) {
 								next;
 								mes "[Pisruik]";
-								mes "Could you go get them for me?";
-								next;
-								switch( select( "Sorry.. but I'm busy.", "Yup I'll do them for you.", "What am I going to get in return?")) {
-								case 1:
-									goto L_no;
-								case 2:
-									goto L_do;
-								case 3:
-									goto L_return;
-								}
-							} else {
+								mes "I wonder...";
+								mes "If you understand";
+								mes "the way I feel, how";
+								mes "much I've had to sacrifice";
+								mes "for my dream. Heh, anyway...";
+							}
+							next;
+							mes "[Pisruik]";
+							mes "I hope you understand that";
+							mes "it's too dangerous for me to";
+							mes "gather Maneater Blossoms on";
+							mes "my own, so if I'm going to get";
+							mes "as much help as I can. Thanks";
+							mes "again for being cooperative.";
+							close;
+						case 3:
+							mes "[Pisruik]";
+							mes "Ha ha ha ha!";
+							mes "That's real business";
+							mes "like of you! Alright,";
+							mes "I may be poor, but if";
+							mes "you help me, I'll give you";
+							mes "the results of my research.";
+							next;
+							if (select("Nah, I'm too busy.:Alright, I'll help you.") == 1) {
+								set ALCHE_SK,5;
 								mes "[Pisruik]";
-								mes "You just told me that you would";
-								mes "bring me the items and";
-								mes "you didn't collect any?";
-								mes "Argh...";
-								mes "If you didn't want to do it";
-								mes "you could have told me.";
+								mes "I guess I'll have to gather";
+								mes "those on my own. Alright, well,";
+								mes "seeing as we've both gotten";
+								mes "what we wanted, I'll suppose";
+								mes "your business with me is done.";
+								close;
+							}
+							set ALCHE_SK,6;
+							mes "[Pisruik]";
+							mes "Thanks, I really";
+							mes "appreciate it. While";
+							mes "I'm waiting for you,";
+							mes "I can start boiling";
+							mes "the Clover extract.";
+							next;
+							select("Clover extract? What's that for?");
+							mes "[Pisruik]";
+							mes "Well, I need the Clover";
+							mes "extract for a compound";
+							mes "that I'm going to make with";
+							mes "the Maneater Blossoms. I'm";
+							mes "kind of weak, so I try not to";
+							mes "travel too far when I can.";
+							next;
+							mes "[Pisruik]";
+							mes "Yeah, ever since I was";
+							mes "little, I've had a weak";
+							mes "heart and bad eyesight.";
+							mes "The doctor tells me to avoid";
+							mes "stress and hard work, but";
+							mes "researching is my life.";
+							if (Sex == 0) {
 								next;
 								mes "[Pisruik]";
-								mes "Nevermind.";
-								mes "I don't care whether if you come or not.";
-								close;
+								mes "I wonder...";
+								mes "If you understand";
+								mes "the way I feel, how";
+								mes "much I've had to sacrifice";
+								mes "for my dream. Heh, anyway...";
 							}
+							next;
+							mes "[Pisruik]";
+							mes "I hope you understand that";
+							mes "it's too dangerous for me to";
+							mes "gather Maneater Blossoms on";
+							mes "my own, so if I'm going to get";
+							mes "as much help as I can. Thanks";
+							mes "again for being cooperative.";
+							close;
 						}
 					}
-				case 2:
-					mes "[Pisruik]";
-					mes "Oh, right. Large Jellopy.";
-					mes "...wasn't what I asked for.";
-					mes "I already have enough Large Jellopy";
-					mes "with me right now...";
-					mes "I asked for something else.";
-					close;
+					else if (countitem(715) == 0 && countitem(1093) == 0 && countitem(950) == 0 && countitem(1057) == 0) {
+						mes "[Pisruik]";
+						mes "So you knew what";
+						mes "you had to bring, came";
+						mes "to remind me what I had";
+						mes "forgotten, but didn't bring";
+						mes "anything? Weird. Ah well.";
+						mes "Come with the stuff next time.";
+						close;
+					}
+					else {
+						mes "[Pisruik]";
+						mes "Oh, this isn't good, some";
+						mes "of the items I asked for are";
+						mes "missing. I'm sorry, but Alchemy";
+						mes "gets dangerously unpredictable";
+						mes "when things aren't used in just";
+						mes "the right amounts. Hmmm...";
+						next;
+						mes "[Pisruik]";
+						mes "Well, I can afford to";
+						mes "push my deadlines back";
+						mes "if you promise to return";
+						mes "with the materials I need";
+						mes "as soon as you possibly can.";
+						close;
+					}
 				}
+				mes "[Pisruik]";
+				mes "Large Jellopy?";
+				mes "Yes, Large--no.";
+				mes "Wait, that doesn't";
+				mes "sound right at all.";
+				mes "No, it was something";
+				mes "else I need you to get.";
+				close;
 			case 2:
 				mes "[Pisruik]";
-				mes "Blue Gemstones...";
-				mes "Did I ask for them?";
-				mes "I'm sure that until yesterday I was making";
-				mes "a medicine which would increase immunity to certain elements...";
-				mes "Sigh...how would I continue the research with memory like this?";
+				mes "Blue Gemstones...?";
+				mes "No, that was for the";
+				mes "potion that increases";
+				mes "tolerance to the Water";
+				mes "property, I think. What's";
+				mes "wrong with my memory?!";
 				close;
 			case 3:
 				mes "[Pisruik]";
-				mes "Red Gemstones...";
-				mes "Did I ask for these?";
-				mes "I'm sure that until yesterday I was making";
-				mes "a medicine which would increase immunity to certain elements...";
-				mes "Sigh...how would I continue the research with memory like this?";
+				mes "Red Gemstones...?";
+				mes "No, that was for the";
+				mes "potion that increases";
+				mes "tolerance to the Earth";
+				mes "property, I think. What's";
+				mes "wrong with my memory?!";
 				close;
 			}
-		} else if(ALCHE_SK == 3) {
-			mes "[Pisruik]";
-			mes "?";
-			mes "Where did you wander off to";
-			mes "in the middle of my explanation?";
-			next;
-			set ALCHE_SK, 4;
+		}
+		else if (ALCHE_SK == 3) {
 			mes "[Pisruik]";
-			mes "I am making a medicine right now.";
+			mes "Why did you just leave?";
+			mes "You didn't even let me";
+			mes "finish talking! Oh well,";
+			mes "maybe it's not your fault.";
+			mes "Anyway, just so you know,";
+			mes "I'm developing a new medicine.";
+			set ALCHE_SK,4;
 			close;
-		} else if(ALCHE_SK == 4) {//When you stopped listening to his explanation
+		}
+		else if (ALCHE_SK == 4) {
+			//NPC dialogue interrupted
 			mes "[Pisruik]";
-			mes "I told you that I am making a medicine...";
-			mes "Do you need me to explain ?";
+			mes "Alright, did you";
+			mes "want to learn more";
+			mes "about the medicine that";
+			mes "I'm developing? I mean,";
+			mes "that's why you came, right?";
 			next;
-			switch( select( "No", "Yes")) {
-			case 1:
+			if (select("No, thanks.:Yes, please.") == 1) {
 				mes "[Pisruik]";
-				mes "Well never mind then.";
-				mes "I am really busy right now.";
+				mes "Alright then.";
+				mes "Really? Well, I'm";
+				mes "willing to spend the";
+				mes "time to explain it to";
+				mes "you. After all, you did";
+				mes "help me out just then.";
 				close;
-			case 2:
-				goto L_do;
 			}
-		} else if(ALCHE_SK == 5) { //When you replied "no"
 			mes "[Pisruik]";
-			mes "I told you I'm busy right?";
-			mes "and if you keep wandering around here";
-			mes "without any business";
-			mes "people are going to turn hostile";
-			mes "towards you. Okay?";
+			mes "I'm working on a new";
+			mes "form of medicine that,";
+			mes "hopefully, will be used";
+			mes "for the betterment and";
+			mes "protection of mankind!";
+			next;
+			mes "[Pisruik]";
+			mes "Anyway, this medicine";
+			mes "reacts with the human body's";
+			mes "digestive enzymes to initiate";
+			mes "temporary metabolic changes";
+			mes "that artificially stop heat";
+			mes "absorption into the body.";
+			next;
+			mes "[Pisruik]";
+			mes "The actual effect of this";
+			mes "medicine is that it greatly";
+			mes "increases the body's resistance";
+			mes "to most forms of heat! However,";
+			mes "it will also reduce resistance";
+			mes "to cold as a side effect.";
+			next;
+			mes "[Pisruik]";
+			mes "I know my medicine sounds";
+			mes "a little weird, but think of";
+			mes "the applications! If used in";
+			mes "the right situations, this";
+			mes "medicine may be quite handy.";
 			next;
-			switch( select( "Okay okay.", "I was wondering if I could help.")) {
+			mes "[Pisruik]";
+			mes "Ah, seeing as you're still";
+			mes "here, would you mind helping";
+			mes "me again? I need about, hmm,";
+			mes "20 Maneater Blossoms. If you";
+			mes "could bring them to me, it'd";
+			mes "really help me out a lot.";
+			next;
+			switch(select("Nope, I'm too busy!:Sure, I'll help you.:What's in it for me?")) {
 			case 1:
+				set ALCHE_SK,5;
 				mes "[Pisruik]";
-				mes "...";
-				mes "Then go already.";
+				mes "I guess I'll have to gather";
+				mes "those on my own. Alright, well,";
+				mes "seeing as we've both gotten";
+				mes "what we wanted, I'll suppose";
+				mes "your business with me is done.";
 				close;
 			case 2:
+				set ALCHE_SK,6;
+				mes "[Pisruik]";
+				mes "Thanks, I really";
+				mes "appreciate it. While";
+				mes "I'm waiting for you,";
+				mes "I can start boiling";
+				mes "the Clover extract.";
+				next;
+				select("Clover extract? What's that for?");
+				mes "[Pisruik]";
+				mes "Well, I need the Clover";
+				mes "extract for a compound";
+				mes "that I'm going to make with";
+				mes "the Maneater Blossoms. I'm";
+				mes "kind of weak, so I try not to";
+				mes "travel too far when I can.";
+				next;
+				mes "[Pisruik]";
+				mes "Yeah, ever since I was";
+				mes "little, I've had a weak";
+				mes "heart and bad eyesight.";
+				mes "The doctor tells me to avoid";
+				mes "stress and hard work, but";
+				mes "researching is my life.";
+				if (Sex == 0) {
+					next;
+					mes "[Pisruik]";
+					mes "I wonder...";
+					mes "If you understand";
+					mes "the way I feel, how";
+					mes "much I've had to sacrifice";
+					mes "for my dream. Heh, anyway...";
+				}
+				next;
+				mes "[Pisruik]";
+				mes "I hope you understand that";
+				mes "it's too dangerous for me to";
+				mes "gather Maneater Blossoms on";
+				mes "my own, so if I'm going to get";
+				mes "as much help as I can. Thanks";
+				mes "again for being cooperative.";
+				close;
+			case 3:
+				mes "[Pisruik]";
+				mes "Ha ha ha ha!";
+				mes "That's real business";
+				mes "like of you! Alright,";
+				mes "I may be poor, but if";
+				mes "you help me, I'll give you";
+				mes "the results of my research.";
+				next;
+				if (select("Nah, I'm too busy.:Alright, I'll help you.") == 1) {
+					set ALCHE_SK,5;
+					mes "[Pisruik]";
+					mes "I guess I'll have to gather";
+					mes "those on my own. Alright, well,";
+					mes "seeing as we've both gotten";
+					mes "what we wanted, I'll suppose";
+					mes "your business with me is done.";
+					close;
+				}
+				set ALCHE_SK,6;
 				mes "[Pisruik]";
-				mes "...I don't know why you changed your mind";
-				mes "But it doesn't matter as long as.";
-				mes "I can continue my research";
-				mes "Cough, Cough";
+				mes "Thanks, I really";
+				mes "appreciate it. While";
+				mes "I'm waiting for you,";
+				mes "I can start boiling";
+				mes "the Clover extract.";
 				next;
+				select("Clover extract? What's that for?");
 				mes "[Pisruik]";
-				mes "...Sigh.";
-				mes "If I didn't have any fits";
-				mes "I could finish very quickly...";
-				mes ".....is it asking for too much from my body?.";
-				mes "hahaha...";
+				mes "Well, I need the Clover";
+				mes "extract for a compound";
+				mes "that I'm going to make with";
+				mes "the Maneater Blossoms. I'm";
+				mes "kind of weak, so I try not to";
+				mes "travel too far when I can.";
 				next;
-				set ALCHE_SK, 6;
 				mes "[Pisruik]";
-				mes "20 Maneater Blossoms.";
-				mes "That's all I need.";
+				mes "Yeah, ever since I was";
+				mes "little, I've had a weak";
+				mes "heart and bad eyesight.";
+				mes "The doctor tells me to avoid";
+				mes "stress and hard work, but";
+				mes "researching is my life.";
 				if (Sex == 0) {
-					mes "...Please.";
-					mes "It'd be great if you could bring it to me as soon as possible.";
-				}				
+					next;
+					mes "[Pisruik]";
+					mes "I wonder...";
+					mes "If you understand";
+					mes "the way I feel, how";
+					mes "much I've had to sacrifice";
+					mes "for my dream. Heh, anyway...";
+				}
+				next;
+				mes "[Pisruik]";
+				mes "I hope you understand that";
+				mes "it's too dangerous for me to";
+				mes "gather Maneater Blossoms on";
+				mes "my own, so if I'm going to get";
+				mes "as much help as I can. Thanks";
+				mes "again for being cooperative.";
 				close;
 			}
-		} else if(ALCHE_SK == 6) { //Second Item
+		}
+		else if (ALCHE_SK == 5) {
+			//refuse bringing Maneater Blossom
+			mes "[Pisruik]";
+			mes "I'm busy right now.";
+			mes "You didn't forget";
+			mes "anything did you?";
+			mes "If not, you better";
+			mes "get going and let";
+			mes "me do my work.";
+			next;
+			if (select("Alright, sorry to bother you.:Can I still help you?") == 1) {
+				mes "[Pisruik]";
+				mes "Yeah, whatever.";
+				mes "Just hurry up and leave";
+				mes "so that I can concentrate.";
+				close;
+			}
+			mes "[Pisruik]";
+			mes "Huh? What made you";
+			mes "change your mind? Well,";
+			mes "I can't afford not to accept";
+			mes "any help, so I guess that's";
+			mes "a \"Yes.\" Yeah, you can help.";
+			next;
+			mes "[Pisruik]";
+			mes "Alright, go and get me";
+			mes "20 Maneater Blossoms.";
+			mes "If I weren't so sickly, I'd get";
+			mes "them myself, but--*Cough* as";
+			mes "you can see, I don't feel so well. ^FFFFFF ^000000";
+			set ALCHE_SK,6;
+			next;
+			mes "[Pisruik]";
+			if (Sex == 0) {
+				mes "I... I really";
+				mes "appreciate your";
+				mes "willingness to help";
+				mes "me in my research...";
+			}
+			else {
+				mes "I hope you get those";
+				mes "items to me as soon as";
+				mes "you can. And don't flake";
+				mes "out on me this time!";
+			}
+			close;
+		}
+		else if (ALCHE_SK == 6) {
 			if (countitem(1032) > 19) {
-				delitem 1032, 20;
-				set ALCHE_SK, 7;
-				mes "[Pisruij]";
-				mes "...Thanks a lot.";
+				delitem 1032,20; //Blossom_Of_Maneater
+				set ALCHE_SK,7;
+				mes "[Pisruik]";
+				mes "Thanks so much for";
+				mes "bringing me these";
+				mes "Maneater Blossoms.";
 				if (Sex == 0) {
-					mes "Thanks so much.. Doing all these for me...";
+					mes "You don't know how";
+					mes "much this means to me~";
+				}
+				else {
+					mes "Now all I have to do";
+					mes "is mix these with the";
+					mes "Clover extract I prepared.";
 				}
-				mes "Okay, now if I add these blossoms to the clover brew";
-				mes "Then...";
-				mes "OY...";
 				next;
-				set ALCHE_SK, 9;
-				misceffect 183;
+				set ALCHE_SK,9;
+				specialeffect 183; //"Pisruik" EF_SUI_EXPLOSION
 				mes "[Pisruik]";
-				mes "AHH!";
+				mes "Ah!";
+				mes "M-my face!";
 				next;
+				//...Pretty Boy mode -_-
 				mes "[Pisruik]";
-				mes "Are you hurt anywhere?";
+				mes "Hey...";
+				mes "Are you alright?";
+				mes "That was a pretty";
+				mes "big explosion...";
 				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "...Your glasses...";
-				mes "They are broken in to pieces...";
-				mes "....";
+				mes "["+ strcharinfo(0) +"]";
+				mes "Your glasses...";
+				mes "They're broken...";
 				next;
 				if (Sex == 0) {
-					mes " == The glasses he wore fell ==";
-					mes " == and broke into pieces. ==";
-					mes " == It was unbelievable that ==";
-					mes " == The face underneath that glass ==";
-					mes " == was that of a grumpy alchemist... ==";
-				} else {
-					mes " == I could not believe. ==";
-					mes " == the difference between the face ==";
-					mes " == which I was staring into, ==";
-					mes " == and the one I just saw minutes ago ==";
+					mes "^3355FFThe explosion destroyed";
+					mes "Pisruik's glasses, revealing";
+					mes "the beautiful face of a";
+					mes "gorgeous, gorgeous man.^000000";
+				}
+				else {
+					mes "^3355FFThe explosion blew off";
+					mes "Pisruik's glasses. Without";
+					mes "them, he looks more like";
+					mes "a male model than a dorky";
+					mes "scientific researcher.^000000";
 				}
 				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "....well.... errr...";
+				mes "["+ strcharinfo(0) +"]";
+				mes "Holy crap!";
+				mes "You're one";
+				mes "good looking guy!";
 				next;
 				mes "[Pisruik]";
-				mes "Are you sure you are okay?";
-				mes "Sorry, I can't see well without glasses";
-				mes "So I can't really do anything except for";
-				mes "Checking that there is no blood.";
+				mes "I c-can't see too";
+				mes "well without my glasses.";
+				mes "Well, at least I can tell";
+				mes "that you're not bleeding.";
+				mes "But are you alright?";
 				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "...Yeah I'm fine.";
-				mes "But..Your glasses...";
+				mes "["+ strcharinfo(0) +"]";
+				mes "Oh, I'm fine.";
+				mes "But what are you";
+				mes "going to do about";
+				mes "your glasses?";
 				next;
 				mes "[Pisruik]";
-				mes "....What am I going to do.";
-				mes "I don't have a spare one right now...";
-				mes "...";
+				mes "Shoot, you're right.";
+				mes "I don't happen to have";
+				mes "an extra pair. Hey, can";
+				mes "you get me a pair of glasses,";
+				mes "the same kind I used to wear?";
 				next;
 				mes "[Pisruik]";
-				mes "Hey. "+strcharinfo(0)+" ";
-				mes "I'm sorry but could you go and";
-				mes "get me a set of glasses just like the one";
-				mes "I was wearing?";
-				next;
-				mes "[Pisruik]";
-				mes "I can't move without my glasses";
-				mes "So if you could get me a set";
-				mes "I'd be really greatful...";
-				mes "....Truly.";
-				mes "Please?.";
+				mes "I know it's too much";
+				mes "to ask you for, but I'm";
+				mes "almost blind without them.";
+				mes "I can't do very much if I can't";
+				mes "even see. I'm really sorry";
+				mes "about this, "+ strcharinfo(0) +".";
 				close;
 			}
+			else {
 				mes "[Pisruik]";
-				mes "Hmm...";
-				mes "I need 20 more";
-				mes "Maneater Blossom to do experiment...";
-				next;
-				mes " == Mesmerized in a deep thouht ==";
-				mes " == While looking at the test tube. ==";
+				mes "Would you come back with";
+				mes "20 Maneater Blossoms";
+				mes "so that I can finish this";
+				mes "medicine I'm working on?";
+				mes "Thanks, thanks, I've got";
+				mes "to hustle with this project...";
 				close;
-		} else if(ALCHE_SK == 7) {
-			set ALCHE_SK, 8;
+			}
+		}
+		else if (ALCHE_SK == 7) {
+			set ALCHE_SK,8;
 			mes "[Pisruik]";
-			mes "...Sigh it's not working as well as I thought it would.";
-			mes "Could you get me another Maneater Blossom?...";
-			mes "Please..?";
+			mes "Hmmm...";
+			mes "Actually, I miscalculated";
+			mes "the number of Maneater";
+			mes "Blossoms that I need. Would";
+			mes "you bring me one more? Sorry,^FFFFFF ^000000 I know it's kind of troublesome...";
 			close;
-		} else if(ALCHE_SK == 8) {
+		}
+		else if (ALCHE_SK == 8) {
 			if (countitem(1032) > 0) {
-				delitem 1032, 1;
-				set ALCHE_SK, 7;
+				delitem 1032,1; //Blossom_Of_Maneater
+				set ALCHE_SK,7;
 				mes "[Pisruik]";
-				mes "...Thanks.";
+				mes "Thanks so much!";
+				mes "Now I finally have the";
+				mes "exact amount of Maneater";
+				mes "Blossoms that I'll need.";
 				if (Sex == 0) {
-					mes "..Looks like I've placed another burden on you.";
-					mes "Sorry.";
+					mes "I'm really sorry for putting";
+					mes "your through all this trouble.";
+				}
+				else {
+					mes "Finally, I begin the most";
+					mes "exciting part of this project!";
 				}
-				mes "Well then, all I have to do is add this and..";
-				mes "Aha!...";
 				next;
-				set ALCHE_SK, 9;
-				donpcevent "Pisruik Quv::OnExplosion";
+				set ALCHE_SK,9;
+				specialeffect 183; //"Pisruik" EF_SUI_EXPLOSION
 				mes "[Pisruik]";
-				mes "AHH!";
+				mes "Ah!";
+				mes "M-my face!";
 				next;
+				//...Pretty Boy mode -_-
 				mes "[Pisruik]";
-				mes "Are you hurt anywhere?";
+				mes "Hey...";
+				mes "Are you alright?";
+				mes "That was a pretty";
+				mes "big explosion...";
 				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "...Your glasses...";
-				mes "They are broken in to pieces...";
-				mes "....";
+				mes "["+ strcharinfo(0) +"]";
+				mes "Your glasses...";
+				mes "They're broken...";
 				next;
 				if (Sex == 0) {
-					mes " == The glasses he wore fell ==";
-					mes " == and broke into pieces. ==";
-					mes " == It was unbelievable that ==";
-					mes " == The face underneath that glass ==";
-					mes " == was that of a grumpy alchemist... ==";
-				} else {
-					mes " == I could not believe. ==";
-					mes " == the difference between the face ==";
-					mes " == which I was staring into, ==";
-					mes " == and the one I just saw minutes ago ==";
+					mes "^3355FFThe explosion destroyed";
+					mes "Pisruik's glasses, revealing";
+					mes "the beautiful face of a";
+					mes "gorgeous, gorgeous man.^000000";
+				}
+				else {
+					mes "^3355FFThe explosion blew off";
+					mes "Pisruik's glasses. Without";
+					mes "them, he looks more like";
+					mes "a male model than a dorky";
+					mes "scientific researcher.^000000";
 				}
 				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "....well.... errr...";
+				mes "["+ strcharinfo(0) +"]";
+				mes "Holy crap!";
+				mes "You're one";
+				mes "good looking guy!";
 				next;
 				mes "[Pisruik]";
-				mes "Are you sure you are okay?";
-				mes "Sorry, I can't see well without glasses";
-				mes "So I can't really do anything except for";
-				mes "Checking that there is no blood.";
+				mes "I c-can't see too";
+				mes "well without my glasses.";
+				mes "Well, at least I can tell";
+				mes "that you're not bleeding.";
+				mes "But are you alright?";
 				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "...Yeah I'm fine.";
-				mes "But..Your glasses...";
+				mes "["+ strcharinfo(0) +"]";
+				mes "Oh, I'm fine.";
+				mes "But what are you";
+				mes "going to do about";
+				mes "your glasses?";
 				next;
 				mes "[Pisruik]";
-				mes "....What am I going to do.";
-				mes "I don't have a spare one right now...";
-				mes "...";
+				mes "Shoot, you're right.";
+				mes "I don't happen to have";
+				mes "an extra pair. Hey, can";
+				mes "you get me a pair of glasses,";
+				mes "the same kind I used to wear?";
 				next;
 				mes "[Pisruik]";
-				mes "Hey. "+strcharinfo(0)+" ";
-				mes "I'm sorry but could you go and";
-				mes "get me a set of glasses just like the one";
-				mes "I was wearing?";
-				next;
+				mes "I know it's too much";
+				mes "to ask you for, but I'm";
+				mes "almost blind without them.";
+				mes "I can't do very much if I can't";
+				mes "even see. I'm really sorry";
+				mes "about this, "+ strcharinfo(0) +".";
+				close;
+			}
+			else {
 				mes "[Pisruik]";
-				mes "I can't move without my glasses";
-				mes "So if you could get me a set";
-				mes "I'd be really greatful...";
-				mes "....Truly.";
-				mes "Please?.";
+				mes "Hmmm...";
+				mes "Actually, I miscalculated";
+				mes "the number of Maneater";
+				mes "Blossoms that I need. Would";
+				mes "you bring me one more? Sorry,^FFFFFF ^000000 I know it's kind of troublesome...";
 				close;
 			}
-			mes "[Pisruik]";
-			mes "Hmm...";
-			mes "I think I could do this";
-			mes "If I had just one more";
-			mes "Maneater Blossom...";
-			next;
-			mes " == Thinks very hard ==";
-			mes " == While looking at the test tube. ==";
-			close;
-		} else if(ALCHE_SK == 9) {
-			mes " == He is squinting at the ==";
-			mes " == Remains of his broken glasses. ==";
-			mes " == It seems like that no matter how you look at it ==";
-			mes " == he looks much, much better ==";
-			mes " == without his glasses. ==";
+		}
+		else if (ALCHE_SK == 9) {
+			mes "^3355FFPisruik is holding his";
+			mes "broken glasses, squinting";
+			mes "his eyes. It seems he like";
+			mes "he really does need them,";
+			mes "even if he looks much less";
+			mes "dorky without them.^000000";
 			next;
-			switch( select( "Give 'Something'.", "Don't give him anything.")) {
-			case 1:
-				if (countitem(2203) > 0) {
-					delitem 2203, 1;
-					set ALCHE_SK, 10;
-					mes " == I gave him the set of glasses ==";
+			if (select("Let him try a pair of your glasses:Don't give him anything") == 1) {
+				if (countitem(2243) > 0) {
+					delitem 2243,1; //Spinning_Eyes
+					set ALCHE_SK,10;
+					//changes the quest steps by deicision.
+					mes "["+ strcharinfo(0) +"]";
+					mes "Here, why don't you";
+					mes "check I'm carrying and";
+					mes "see if there's a pair of";
+					mes "glasses that you can use?";
 					next;
 					mes "[Pisruik]";
-					mes "Hm?";
-					mes "Who? ..A, "+strcharinfo(0)+"?";
-					mes "Thanks.";
-					mes "Let's see...";
-					mes "It did blow up but the test tube didn't break..";
+					mes "Huh? Oh, is that you?";
+					mes "Ah, this pair of glasses";
+					mes "works! Thanks a lot, now";
+					mes "I can see again! Now, let";
+					mes "me check the results of the";
+					mes "experiment we conducted.";
 					next;
 					mes "[Pisruik]";
-					mes "Haha..I was surprized";
-					mes "For no reason then.";
-					mes "Let's see the result...";
-					mes "...";
+					mes "Okay, the test tube wasn't";
+					mes "damaged. Yes, according to";
+					mes "these readings, this medicine";
+					mes "should be fully functional!";
+					mes "I think it was a success!";
+					mes "Well, theoretically anyway.";
 					next;
 					mes "[Pisruik]";
-					mes "...Good Good.";
-					mes "I think in theory, I have succeeded.";
-					mes "Although it might have problems";
-					mes "because of the ethics involved with";
-					mes "giving chemicals to";
-					mes "humans for purposes like this..";
+					mes "Hmm, changing the attributes";
+					mes "of the human body for certain";
+					mes "effects may cause controversy";
+					mes "later, but hopefully this thing";
+					mes "I've invented will be used for";
+					mes "good. Ah, that's right!";
 					next;
 					mes "[Pisruik]";
-					mes "It's not like there haven't been";
-					mes "those types of experiments so";
-					mes "I think it'd be fine but.";
-					mes "Oh...right.";
-					mes ""+strcharinfo(0)+".";
-					mes "Would you like to try this?";
+					mes "Would you like me to";
+					mes "teach you everything I've";
+					mes "learned in my research? You";
+					mes "should be able to create a new";
+					mes "type of potion by making use of";
+					mes "the knowledge I can teach you.";
 					next;
-					mes "[Pisruik]";
-					mes "You are someone who would like to";
-					mes "go out side and run around";
-					mes "so you will have times when you";
-					mes "can put this to a good use";
-					next;
-					switch( select( "Certainly!", "no...")) {
-					case 1:
+					if (select("Sure!:No, thanks.") == 1) {
 						mes "[Pisruik]";
-						mes "Well then could you read this";
-						mes "Paper over for me?";
-						mes "It was perfect in theory";
-						mes "So I've already submitted my paper,";
-						mes "so this is just a copy";
+						mes "Great, "+ strcharinfo(0) +"!";
+						mes "I know I can trust you";
+						mes "to use this research for";
+						mes "good and noble ends. Now,";
+						mes "please read this thesis and";
+						mes "all of my additional notes...";
 						next;
-						mes " == He gave me a long lecture ==";
-						mes " == about dangers and side effects ==";
-						mes " == of the medicine ==";
+						mes "^3355FFPisruik thoroughly";
+						mes "explains the properties";
+						mes "of his medicine, the reaction";
+						mes "of the human organs to it, as";
+						mes "well as a few warnings about";
+						mes "the medicine's side effects.^000000";
 						next;
-						set ALCHE_SK, 11;
-						getitem 7434, 1;
+						set ALCHE_SK,11;
+						getitem 7434,1; //Elemental_Create_Book
 						mes "[Pisruik]";
-						mes "...I think that";
-						mes "You can put this to a good use.";
-						mes "You have probably given it a good thought";
-						mes "While collecting the items so";
-						mes "You could understand it better than I do";
+						mes "Well, you should be";
+						mes "ready to make your own";
+						mes "potions that are a variation";
+						mes "of my medicine. But you'll";
+						mes "probably need to keep that";
+						mes "thesis as a ready reference.";
 						next;
 						mes "[Pisruik]";
 						if (Sex == 1) {
-							mes "If you visit me again";
-							mes "I'll probably have another favor for you.";
-						} else {
-							mes "...Thanks for being here to talk to me.";
+							mes "Hopefully, we'll";
+							mes "meet again sometime";
+							mes "in the future. Good luck on";
+							mes "your journeys, adventurer.";
+							mes "*Cough cough* Now... What";
+							mes "will be my next project?";
 						}
-						mes "Cough.. Cough";
-						mes "Sigh. Well then, should I get started on the next experiement...";
-						close;
-					case 2:
-						mes "[Pisruik]";
-						mes "....Well too bad.";
-						mes "If you change your mind";
-						mes "Then come back later.";
-						if (Sex == 0) {
-							next;
-							mes " == He looked a lot waner ==";
-							mes " == and a lot more tired ==";
-							mes " == than usual. ==";
+						else {
+							mes "Anyway, I need to be";
+							mes "working on a new project";
+							mes "soon, so I suppose this is";
+							mes "where we part ways for now.";
+							mes "But I must say, it was truly";
+							mes "a great pleasure to meet you...";
 						}
 						close;
 					}
+					mes "[Pisruik]";
+					mes "R-Really...?";
+					mes "Well, if you ever change";
+					mes "your mind, feel free to come";
+					mes "back for me to teach you.";
+					if (Sex == 0) {
+						mes "And it's no trouble at all!";
+						mes "I really enjoy your company...";
+					}
+					close;
+				}
+				else {
+					mes "^3355FFUnfortunately, there";
+					mes "is nothing in your inventory";
+					mes "that seems like a suitable";
+					mes "replacement for Pisruik's";
+					mes "broken glasses.^000000";
+					close;
 				}
-				mes " == Don't have much to give to him. ==";
-				close;
-			case 2:
-				mes "["+strcharinfo(0)+"]";
-				mes "...I think you look so much better without glasses...";
-				next;
-				mes "[Pisruik]";
-				mes "Hmm?";
-				mes "What did you just say?";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Erm.. hahahaha.";
-				mes "Nothing nothing!";
-				close;
 			}
-		} else if(ALCHE_SK == 10) {
+			mes "["+ strcharinfo(0) +"]";
+			mes "Listen, you look so";
+			mes "much better when you're";
+			mes "not wearing glasses.";
+			next;
 			mes "[Pisruik]";
-			mes "I think in theory it's a success,";
-			mes "Do you want to learn how to make it?";
+			mes "Excuse me,";
+			mes "come again?";
 			next;
-			switch( select( "Yes!", "No...")) {
-			case 1:
+			mes "["+ strcharinfo(0) +"]";
+			mes "Hahahahhaha~!";
+			mes "No-nothing at all!";
+			close;
+		}
+		else if (ALCHE_SK == 10) {
+			mes "[Pisruik]";
+			mes "So, "+ strcharinfo(0) +",";
+			mes "Would you like me to";
+			mes "teach you the results";
+			mes "of the research I've''";
+			mes "been conducting?";
+			next;
+			if (select("Yes!:No, thanks.") == 1) {
 				mes "[Pisruik]";
-				mes "Well then could you read this";
-				mes "Paper over for me?";
-				mes "It was perfect in theory";
-				mes "So I've already submitted my paper,";
-				mes "so this is just a copy";
+				mes "Great, "+ strcharinfo(0) +"!";
+				mes "I know I can trust you";
+				mes "to use this research for";
+				mes "good and noble ends. Now,";
+				mes "please read this thesis and";
+				mes "all of my additional notes...";
 				next;
-				mes " == He gave me a long lecture ==";
-				mes " == about dangers and side effects ==";
-				mes " == of the medicine ==";
+				mes "^3355FFPisruik thoroughly";
+				mes "explains the properties";
+				mes "of his medicine, the reaction";
+				mes "of the human organs to it, as";
+				mes "well as a few warnings about";
+				mes "the medicine's side effects.^000000";
 				next;
-				set ALCHE_SK, 11;
-				getitem 7434, 1;
+				set ALCHE_SK,11;
+				getitem 7434,1; //Elemental_Create_Book
 				mes "[Pisruik]";
-				mes "...I think that";
-				mes "You can put this to a good use.";
-				mes "You have probably given it a good thought";
-				mes "While collecting the items so";
-				mes "You could understand it better than I do";
+				mes "Well, you should be";
+				mes "ready to make your own";
+				mes "potions that are a variation";
+				mes "of my medicine. But you'll";
+				mes "probably need to keep that";
+				mes "thesis as a ready reference.";
 				next;
 				mes "[Pisruik]";
 				if (Sex == 1) {
-					mes "If you visit me again";
-					mes "I'll probably have another favor for you.";
-				} else {
-					mes "...Thanks for being here to talk to me.";
+					mes "Hopefully, we'll";
+					mes "meet again sometime";
+					mes "in the future. Good luck on";
+					mes "your journeys, adventurer.";
+					mes "*Cough cough* Now... What";
+					mes "will be my next project?";
 				}
-				mes "Cough.. Cough";
-				mes "Sigh. Well then should I get started on the next experiement...";
-				close;
-			case 2:
-				mes "[Pisruik]";
-				mes "....Well too bad.";
-				mes "If you change your mind";
-				mes "Then come back later.";
-				if (Sex == 0) {
-					next;
-					mes " == He looked a lot waner ==";
-					mes " == and a lot more tired ==";
-					mes " == than usual. ==";
+				else {
+					mes "Anyway, I need to be";
+					mes "working on a new project";
+					mes "soon, so I suppose this is";
+					mes "where we part ways for now.";
+					mes "But I must say, it was truly";
+					mes "a great pleasure to meet you...";
 				}
 				close;
 			}
-		} else if(ALCHE_SK == 11) {
+			mes "[Pisruik]";
+			mes "R-Really...?";
+			mes "Well, if you ever change";
+			mes "your mind, feel free to come";
+			mes "back for me to teach you.";
+			if (Sex == 0) {
+				mes "And it's no trouble at all!";
+				mes "I really enjoy your company...";
+			}
+			close;
+		}
+		else if (ALCHE_SK == 11) {
 			if (countitem(7434) == 0) {
 				mes "[Pisruik]";
-				mes "....I guess,";
-				mes "You haven't found much use for that item.";
+				mes "Uh oh...";
+				mes "You lost the thesis";
+				mes "I wrote for you? I don't";
+				mes "have the time to write";
+				mes "another one for you now...";
 				close;
-			} else if(countitem(7434) == 1) {
+			}
+			else if (countitem(7434) == 1) {
 				mes "[Pisruik]";
-				mes "Has the item been very helpful to you?";
+				mes "So, how have you been";
+				mes "using the potions that";
+				mes "I've taught you to make?";
+				mes "Hopefully, they'll come";
+				mes "in handy in your adventures.";
 				close;
-			} else if(countitem(7434) > 1) {
+			}
+			else if (countitem(7434) > 1) {
 				mes "[Pisruik]";
-				mes "....";
-				mes "Well....I'm selling these but";
-				mes "It's not like I'll sign the books";
-				mes "if you bring them in truckloads.";
+				mes "Huh, so copies of my";
+				mes "thesis are circulating";
+				mes "around in public? Well,";
+				mes "I'm sorry, but I don't have";
+				mes "time to autograph your copy...";
 				close;
 			}
 		}
+		else {
+			mes "[Pisruik]";
+			mes "Mmm...?";
+			mes "Did you need anything";
+			mes "in particular? Though,";
+			mes "I'm afraid someone in";
+			mes "my position won't be";
+			mes "much help to you.";
+			close;
+		}
+	}
+	else {
 		mes "[Pisruik]";
-		mes "?";
+		mes "Mmm...?";
+		mes "Did you need anything";
+		mes "in particular? Though,";
+		mes "I'm afraid someone in";
+		mes "my position won't be";
+		mes "much help to you.";
 		close;
 	}
-	mes "[Pisruik]";
-	mes "What are you looking at!";
-	mes "Go away!";
-	close;
-
-L_no:
-	set ALCHE_SK, 5;
-	mes "[Pisruik]";
-	mes "Well, too bad.";
-	mes "I guess I'll have to go get them myself...";
-	mes "Well I kept my part of the deal";
-	mes "So, you don't have anymore business with me";
-	mes "right?";
-	close;
-
-L_do:
-	set ALCHE_SK, 6;
-	mes "[Pisruik]";
-	mes "Thanks a lot.";
-	mes "I'll be waiting for you.";
-	mes "Brewing clovers...";
-	next;
-	switch( select( "Oh, what's that for?")) {
-	case 1:
-	}
-	mes "[Pisruik]";
-	mes "Where do you use this?";
-	mes "Well..its not brewing just clovers...";
-	next;
-	mes "[Pisruik]";
-	mes "It has some herbs in them as well,";
-	mes "I don't have much experiences with adventuring";
-	mes "so I can't get good quality herbs so";
-	mes "I just dig them out from nearby";
-	mes "and use them.";
-	next;
-	mes "[Pisruik]";
-	mes "As you can see I have bad eyesight,";
-	mes "and really bad heart";
-	mes "so I have to avoid working too hard";
-	mes "but these experiments are the only joy for me...";
-	if (Sex == 0) {
-		mes "...I don't know if you understand.";
-	}
-	next;
-	mes "[Pisruik]";
-	mes "I can get herbs myself";
-	mes "But I can't really get";
-	mes "Maneater Blossoms";
-	mes "So I am asking for a favor from you.";
-	mes "Please have a safe trip.";
-	close;
-
-L_return:
-	mes "[Pisruik]";
-	mes "Oh, are you trying to one up me now eh?";
-	mes "Okay. I am a very poor guy but";
-	mes "if I ever succeed with this";
-	mes "I'll teach you the secrets for free.";
-	mes "How's that?";
-	next;
-	switch( select( "Well I'm too busy...", "Well okay then...")) {
-	case 1:
-		goto L_no;
-	case 2:
-		goto L_do;
-	}
 }
 
-yuno_in04,22,107,3	script	Irahae	740,{
-	mes "[Irahae]";
-	mes "....";
-	mes ".....";
-	mes "Ha Ha";
-	mes "I've finally made it,";
-	mes "A cursed chemical which";
-	mes "Can dissolve anything...";
+yuno_in04,22,107,5	script	Irache#qsk_al	740,{
+	mes "[Irache]";
+	mes "Heh heh heh...!";
+	mes "It's done! With this";
+	mes "formula, I can melt any";
+	mes "substance in the world!";
+	mes "Hahahaha! Nothing stands";
+	mes "between me and world domi--";
 	next;
-	mes "[Irahae]";
-	mes "....But test tube isn't melting...";
-	mes "Did I fail again.";
+	mes "[Irache]";
+	mes "OWWWW!";
+	mes "The secret formula!";
+	mes "It's burning through";
+	mes "the test tube! I've made";
+	mes "it too powerful! Confound it!";
 	close;
 }
 
-yuno_in04,27,107,4	script	Degas	748,{
+yuno_in04,27,107,4	script	Degas#qsk_al	748,{
 	mes "[Degas]";
-	mes "Ugh, only if I had money";
-	mes "Person next to me always mutters about curses.";
-	mes "And the other four-eyed idiot";
-	mes "Always coughs. Sigh";
+	mes "It's such a pain working";
+	mes "so close to these other";
+	mes "scientists. The guy next";
+	mes "time is always cackling";
+	mes "about taking over the";
+	mes "world and whatnot.";
 	next;
 	mes "[Degas]";
-	mes "Only if I had some money";
-	mes "I wouldn't have to go through this.";
-	mes "Sigh...";
+	mes "And this other geek is";
+	mes "always coughing. Between";
+	mes "the two of them, it's far too";
+	mes "noisy to focus on my research!";
+	mes "If only I could work in my very^FFFFFF ^000000 own private, secret laboratory...";
 	close;
 }
 
-yuno_in04,33,106,4	script	Pile of Books	111,{
-	mes "== There is a messy pile of ==";
-	mes "== Books and papers lying around. ==";
-	mes "== But the owner of the table still ==";
-	mes "== manages to find things that are needed. ==";
+yuno_in04,33,106,4	script	Pile of Books#qsk_al	111,{
+	mes "^3355FFIt's simply a pile";
+	mes "of scattered documents.";
+	mes "Although it seems unorganized,";
+	mes "it doesn't look like the people";
+	mes "here have any trouble finding^FFFFFF ^3355FF what they need when they need it.";
 	close;
 }
 
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 1.0 for fully working skills only [Lupus]
+//= 1.1 Added more new skill quests for more classes [Lupus]
+//= Somehow eA engine doesn't let you keep learn't skill V_V'
+//= 1.2 Added to correct locations, correct NPC's, fixed
+//= some of the items required and made them into real
+//= quests. [Reddozen] 
+//= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
+//= 1.3a fixed an item ID typo, thx 2Spiritual Kid
+//= 1.3b Splitted into different files [DracoRPG]
+//= 1.4 Added Creators + Baby Alchemists can pass Bio Ethics
+//= 	Quest too [Lupus]
+//= 1.5 Removed duplicates [Toms] 1.5a fixed typo [Lupus]
+//= 1.6 Moved some NPCs related to Lighthalzen quests. [SinSloth]
+//= 1.7 Updated "Elemental Potion Creation Quest" to the official one. [Samuray22]
+//= 1.8 Added some missing NPCs from the Laboratory. [Samuray22]
+//= 1.8a replaced item "names" with item id [Lupus]
 //============================================================
-// ALCHEMIST - Bio Ethics Quest (Homunculi Skill Branch)
-//============================================================
-
-//=====================Requires Bug Testing=====================
-lhz_in01,46,125,6	script	Rekenber Guard	867,{
-	mes "[Rekenber Guard]";
-	if(isequipped(2241) && isequipped(2243)){
-		mes "......................";
-		next;
-		switch(select("Nice day, huh?","Cancel")){
-			case 1:
-				mes "[Rekenber Guard]";
-				mes "...";
-				close2;
-				warp "lhz_in01",282,172;
-				end;
-				break;
-			case 2:
-				close;
-				break;
-		}
-	}
-	else{
-		mes "...";
-		close;
-	}
-}
-
-lhz_in01,199,137,8	script	Scientist#2	865,{
-	mes "[Scientist]";
-	mes "Whoa whoa~!";
-	mes "Please! Don't";
-	mes "touch anything!";
-	mes "I'm dealing with highly";
-	mes "volatile chemicals here!";
-	close;
-}
-lhz_in01,204,138,6	script	Keshibien	750,{
-	if(bioeth >= 2){
-		//Unofficial text
-		mes "[Keshibien]";
-		mes "Hello there~";
-		mes "Are you looking for";
-		mes "more information about";
-		mes "homunculus?";
-		next;
-		mes "[Keshibien]";
-		mes "I shouldn't say";
-		mes "anything, but look";
-		mes "for someone named";
-		mes "Bringel in Lighthalzen.";
-		if(bioeth == 2) set bioeth,3;
-		close;
-		//Unofficial text end
-	}
-	mes "[Keshibien]";
-	mes "Hello there~";
-	mes "You must be from";
-	mes "Rune-Midgarts, right?";
-	mes "It's nice to meet you.";
-	next;
-	mes "[Keshibien]";
-	mes "I hear that the";
-	mes "Alchemists from";
-	mes "over there are pretty";
-	mes "skilled. I wonder if I'll";
-	mes "ever get the change to";
-	mes "collaborate with any of them...";
-	close;
-}
-lhz_in01,203,123,8	script	Scientist#3	750,{
-	mes "[Scientist]";
-	mes "Alright. Pull one test";
-	mes "tube out of the machine,";
-	mes "replace the other test";
-	mes "tube over here and then";
-	mes "clean the first test tube?";
-	next;
-	mes "[Scientist]";
-	mes "Or do I clean the test tube,";
-	mes "put it into the machine and";
-	mes "then replace the other one?";
-	mes "I'm so confused with this";
-	mes "procedure! If only I didn't";
-	mes "lose the instructions...";
-	close;
-}
-lhz_in01,221,131,3	script	Scientist#4	865,{
-	mes "[Scientist]";
-	mes "It takes so long for";
-	mes "this device to process";
-	mes "all the data and give me";
-	mes "the results. Still, the wait";
-	mes "heightens my anticipation...";
-	close;
-}
-lhz_in01,218,141,0	script	Alchemist#2	98,{
-	mes "[Alchemist]";
-	mes "Out of all humans,";
-	mes "I believe Kellasus is";
-	mes "the one who has come";
-	mes "closest to discovering";
-	mes "the secrets of life. He";
-	mes "never fails to amaze me...";
-	next;
-	mes "[Alchemist]";
-	mes "I'm also impressed by the";
-	mes "fact that he doesn't let his";
-	mes "work keep him from being the";
-	mes "best father and husband that";
-	mes "he can for his family. He's";
-	mes "an example for all of us.";
-	next;
-	mes "[Alchemist]";
-	mes "Kellasus really is";
-	mes "an amazing person.";
-	mes "There isn't one Alchemist";
-	mes "that I know who doesn't look";
-	mes "up to him in the realms of";
-	mes "both science and personal life.";
-	close;
-}
-lhz_in01,224,140,8	script	Kellasus	57,{
-	if(MISC_QUEST&64){
-		mes "[Kellasus]";
-		mes "I already taught you";
-		mes "skills of the homunculus...";
-		if(getskilllv(238) == 0 && BaseJob == Job_Alchemist) skill 238,1,0;
-		close;
-	}
-	switch(bioeth){
-	case 4:
-		mes "[Kellasus]";
-		mes "...You're really hard to handle.";
-		mes "I don't think I should";
-		mes "teach you biotechnology.";
-		mes "Besides that, you know";
-		mes "nothing about homunculus!";
-		next;
-		menu "I've learned that",-;
-		mes "[Kellasus]";
-		mes "Oh really?";
-		mes "I will have to test you";
-		mes "on your knowledge of";
-		mes "homunculus then.";
-		next;
-		mes "[Kellasus]";
-		mes "First question.";
-		mes "What is the skill that lets the";
-		mes "homunculus stay in peace?";
-		input @kelques$;
-		next;
-		mes "[Kellasus]";
-		if(@kelques$ != "Vaporize"){
-			mes "Hmpf. I knew you had";
-			mes "no knowledge on";
-			mes "homunculus.";
-			close;
-		}
-		mes "That's right. Second question.";
-		mes "What is the item";
-		mes "that is required to";
-		mes "summon or create";
-		mes "a homunculus?";
-		input @kelques$;
-		next;
-		mes "[Kellasus]";
-		if(@kelques$ != "Embryo"){
-			mes "Hmpf. I knew you had";
-			mes "no knowledge on";
-			mes "homunculus.";
-			close;
-		}
-		mes "Correct. But this is not the end yet.";
-		mes "What is the name";
-		mes "of a skill";
-		mes "that could let you";
-		mes "revive a homunculus?";
-		input @kelques$;
-		next;
-		mes "[Kellasus]";
-		if(@kelques$ != "Homunculus Resurrection"){
-			mes "Hmpf. I knew you had";
-			mes "no knowledge on";
-			mes "homunculus.";
-			close;
-		}
-		mes "After all these discussions,";
-		mes "I won't teach anyone";
-		mes "the skills of homunculus.";
-		mes "The decision is final";
-		mes "and that's it!";
-		set bioeth,5;
-		close;
-		break;
-	case 5:
-		mes "[Kellasus]";
-		mes "After all these discussions,";
-		mes "I won't teach anyone";
-		mes "the skills of homunculus.";
-		mes "The decision is final";
-		mes "and that's it!";
-		close;
-		break;
-	case 6:
-	//Unofficial text and story -.-;
-		mes "[Kellasus]";
-		mes "Oh it's you again? You're really determined.";
-		mes "Well most of the Alchemist";
-		mes "are people who never";
-		mes "let go of their dreams";
-		next;
-		menu "Let's talk about others",-;
-		mes "[Kellasus]";
-		mes "You've spoke to my son?";
-		mes "What did he say?";
-		next;
-		mes "[Kellasus]";
-		mes "...";
-		next;
-		mes "[Kellasus]";
-		mes "He wants me to get back? Okay, well...";
-		mes "I guess you've deserved it.";
-		mes "Here you are, secrets of homunculus are yours now~";
-		if(BaseJob == Job_Alchemist) skill 238,1,0;
-		set MISC_QUEST,MISC_QUEST|64;
-		set bioeth,0;
-		close;
-	default:
-		break;
-	}
-	switch(@keltalk){
-	case 1:
-	//No official text to put here, so I just repeated first text
-		mes "[Kellasus]";
-		mes "Hmm. Who decides what";
-		mes "is right and wrong? What is";
-		mes "meant to be known and what";
-		mes "secrets were never intended";
-		mes "for mankind to understand?";
-		set @keltalk,2;
-		close;
-		break;
-	case 2:
-		mes "[Kellasus]";
-		mes "Haven't I told you not to come back again?";
-		mes "Please leave now!";
-		mes "No matter what you do.";
-		mes "I won't teach you anything about homunculus";
-		set @keltalk,3;
-		set bioeth,1;
-		close;
-		break;
-	case 3:
-		mes "[Kellasus]";
-		mes "Haven't I told you not to come back again?";
-		mes "Please leave now!";
-		mes "No matter what you do.";
-		mes "I won't teach you anything about homunculus";
-		close;
-		break;
-	default:
-		mes "[Kellasus]";
-		mes "Hmm. Who decides what";
-		mes "is right and wrong? What is";
-		mes "meant to be known and what";
-		mes "secrets were never intended";
-		mes "for mankind to understand?";
-		if(BaseJob == Job_Alchemist) set @keltalk,1;
-		close;
-		break;
-	}
-}
-lhz_in01,217,121,6	script	Repairman	851,{
-	mes "[Repairman]";
-	mes "No wonder these things";
-	mes "break all the time! These";
-	mes "machines have been totally";
-	mes "abused! Ugh, there's no";
-	mes "appreciation for all of this";
-	mes "convenient technology...";
-	next;
-	mes "[Repairman]";
-	mes "Yeah, all of this lab";
-	mes "equipment is really sensitive,";
-	mes "not to mention expensive. If";
-	mes "you ever handle this stuff, you";
-	mes "need to be extra cautious.";
-	close;
-}
-lhz_in01,225,122,4	script	Skrajiad	754,{
-	mes "[Skrajiad]";
-	mes "Alchemy is wondrous...";
-	mes "It incorporates every";
-	mes "science and many other";
-	mes "fields of knowledge that";
-	mes "it's not enough to be jack";
-	mes "of all trades... No...";
-	next;
-	mes "[Skrajiad]";
-	mes "In a sense, you must";
-	mes "be a master of all trades";
-	mes "to be proficient in Alchemy";
-	mes "But it's incredibly rewarding to";
-	mes "those of us who never stop asking";
-	mes "how and why our world works.";
-	if(bioeth == 1) set bioeth,2;
-	close;
-}
-lhz_in02,269,273,4	script	Bringel	709,{
-//Unofficial Text
-	if(bioeth == 3){
-		mes "[Bringel]";
-		mes "Oh, you're here to learn about Homunculus?";
-		mes "Well, I can't really help you...";
-		next;
-		mes "[Bringel]";
-		mes "However, I've heard about a skill named";
-		mes "Homunculus Resurrection.";
-		mes "It seems it is a very important thing";
-		mes "for people working on them.";
-		set bioeth,4;
-		close;
-	}
-	mes "[Bringel]";
-	mes "Isn't this hotel great?";
-	mes "I can relax on the couch";
-	mes "And not care about what I";
-	mes "did in the past...";
-	close;
-}
-lhz_in03,106,34,4	script	Golin	706,{
-//Unofficial text
-	if(bioeth == 5){
-		mes "[Golin]";
-		mes "Did you see my";
-		mes "daddy at the lab?";
-		mes "Tell him I said hi!";
-		set bioeth,6;
-		close;
-	}
-	mes "[Golin]";
-	mes "Where's daddy?";
-	mes "I really want";
-	mes "daddy to come back";
-	mes "from the lab.";
-	close;
-}
diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt
index 7a69e290f..f8b346e3e 100644
--- a/npc/quests/skills/assassin_skills.txt
+++ b/npc/quests/skills/assassin_skills.txt
@@ -3,12 +3,991 @@
 //===== By: ================================================== 
 //= Lupus, Reddozen
 //===== Current Version: ===================================== 
-//= 1.3a
+//= 1.4
 //===== Compatible With: ===================================== 
-//= eAthena Revision 3800+
+//= eAthena SVN
 //===== Description: ========================================= 
-//= Temp quests for new skills for 2nd classes
+//= [Aegis Conversion]
+//= Quests for skills: Venom Knife, Sonic Acceleration
 //===== Additional Comments: ================================= 
+//= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
+//============================================================
+
+in_moc_16,14,27,5	script	Assassin#realman	884,{
+	if (BaseJob == Job_Assassin && ASSN_SK2 == 1) {
+		if (getskilllv(1004) == 0) {
+			mes "[Killtin]";
+			mes "Ah yes, that's why you";
+			mes "look so familiar. You're";
+			mes "of those to whom I've taught";
+			mes "the ^990099Venom Knife^000000 skill. So, what";
+			mes "brings you to me this time?";
+			next;
+			mes "[Killtin]";
+			mes "What's that...?!";
+			mes "You want me to teach";
+			mes "it to you once again?";
+			mes "It's a shame you've forgotten,";
+			mes "but I suppose it can't be helped. Alright, alright, I'll teach you.";
+			next;
+			mes "[Killtin]";
+			mes "First, you need to equip";
+			mes "a Knife class weapon, and";
+			mes "then cast Envenom on your";
+			mes "knife. Throwing the blade?";
+			mes "That's all in the wrist. Now,";
+			mes "watch me closely and take note.";
+			next;
+			mes "[Killtin]";
+			mes "You see? Having";
+			mes "good form is essential";
+			mes "to performing flawless";
+			mes "technique. Always basics";
+			mes "before the specifics. Now,";
+			mes "why don't you give it a try?";
+			specialeffect 65; //"Assassin#realman" EF_INVENOM
+			next;
+			mes "[Killtin]";
+			mes "Good... Very good...";
+			mes "Perfect form. Yes...";
+			mes "Hmm. Are you sure that";
+			mes "you forgot how to do this";
+			mes "skill? I suppose that all you";
+			mes "needed was a quick refresher.";
+			specialeffect2 65; // EF_INVENOM
+			next;
+			mes "[Killtin]";
+			mes "Alright, I think it's";
+			mes "safe to say that you've";
+			mes "mastered the Venom Knife";
+			mes "skill. Leave me now, and";
+			mes "always fight for the honor";
+			mes "of the Assassin Guild!";
+			skill 1004,1,0;
+			close;
+		}
+		else {
+			mes "[Killtin]";
+			mes "So how has that";
+			mes "^990099Venom Knife^000000 skill";
+			mes "been working for you?";
+			mes "Be careful, and make sure";
+			mes "that your victims always";
+			mes "deserve what you give them!";
+			close;
+		}
+	}
+	else if (ASSN_SK2 == 1 && ASSN_SK == 7) {
+		mes "[Killtin]";
+		mes "So you've learned all of";
+		mes "the specialized Assassin";
+		mes "skills, eh? Don't let yourself";
+		mes "become overconfident. Strive";
+		mes "for even greater strength for";
+		mes "the Assassin Guild's honor.";
+		close;
+	}
+	else if (ASSN_SK2 == 1) {
+		mes "[Killtin]";
+		mes "So how has that";
+		mes "^990099Venom Knife^000000 skill";
+		mes "been working for you?";
+		mes "Be careful, and make sure";
+		mes "that your victims always";
+		mes "deserve what you give them!";
+		close;
+	}
+	else {
+		if (BaseJob == Job_Assassin) {
+			mes "[Killtin]";
+			mes "Hm? Ah, you're definitely";
+			mes "a member of the Assassin";
+			mes "Guild. Great, you've come";
+			mes "just at the right time.";
+			next;
+			mes "[Killtin]";
+			mes "Our guildmaster recently";
+			mes "succeeded in developing two";
+			mes "new skills for Assassins. I've";
+			mes "been charged with the task of";
+			mes "teaching these new skills to";
+			mes "all the members of our guild.";
+			next;
+			select("New skills?");
+			mes "[Killtin]";
+			mes "That's right, "+name+".";
+			mes "The first skill specifically";
+			mes "enhances the Sonic Blow";
+			mes "skill, and the second skill";
+			mes "is a long range attack that's";
+			mes "named ''^990099Venom Knife^000000.''";
+			next;
+			mes "[Killtin]";
+			mes "If you have any questions,";
+			mes "feel free to ask me about";
+			mes "any of these new skills. It's";
+			mes "my job to teach you as much";
+			mes "as I can about them.";
+			next;
+			while(1) {
+				switch(select("^0000FFSonic Blow Enhancement^000000:^990099Venom Knife^000000:Continue Conversation")) {
+				case 1:
+					mes "[Killtin]";
+					mes "If you've been an Assassin";
+					mes "for a while, then you must";
+					mes "be familiar with the Sonic";
+					mes "Blow skill, which inflicts 8";
+					mes "powerful strikes at an enemy";
+					mes "in one blindingly fast attack.";
+					next;
+					mes "[Killtin]";
+					mes "However, due to the speed";
+					mes "involved in that skill, Sonic";
+					mes "Blow isn't as accurate as it";
+					mes "can be. After years of testing";
+					mes "and research, our guildmaster";
+					mes "developed a way to fix this.";
+					next;
+					mes "[Killtin]";
+					mes "He created a new skill";
+					mes "named ''Sonic Acceleration''";
+					mes "that Assassins can cast on";
+					mes "themselves in order to quickly";
+					mes "detect and accurately strike";
+					mes "the target's fatal points.";
+					next;
+					mes "[Killtin]";
+					mes "In effect, Sonic Acceleration";
+					mes "roughly doubles the damage";
+					mes "that you can inflict with the";
+					mes "Sonic Blow. If you use Sonic";
+					mes "Blow pretty often, then this";
+					mes "skill will be pretty useful.";
+					next;
+					mes "[Killtin]";
+					mes "I suggest that you learn";
+					mes "the Venom Knife skill from";
+					mes "me first. Then, you can talk";
+					mes "to Esmille, the beautiful";
+					mes "Assassin Cross right next to^FFFFFF ^000000 me, to learn Sonic Acceleration.";
+					next;
+					break;
+				case 2:
+					mes "[Killtin]";
+					mes "As you may well know, our";
+					mes "job isn't really known for its";
+					mes "long range attacks. Sure, we";
+					mes "can use Bows, and we've got";
+					mes "a few long distance skills, but";
+					mes "their uses are kind of limited.";
+					next;
+					mes "[Killtin]";
+					mes "This Venom Knife skill was";
+					mes "developed with this weakness";
+					mes "in long range attacking in mind. Basically, we use the Envenom";
+					mes "skill on a knife and throw it at^FFFFFF ^000000 a distant enemy to poison them.";
+					next;
+					break;
+				case 3:
+					mes "[Killtin]";
+					mes "Now, if you like, I can";
+					mes "teach you the ^009900Venom Knife^000000";
+					mes "skill right now. It won't take";
+					mes "that much time, so what do";
+					mes "you say? You ready to learn?";
+					next;
+					while(1) {
+						if (select("Learn Venom Knife:I d-don't wanna learn!") == 1) {
+							mes "[Killtin]";
+							mes "First, you need to equip";
+							mes "a Knife class weapon, and";
+							mes "then cast Envenom on your";
+							mes "knife. Throwing the blade?";
+							mes "That's all in the wrist. Now,";
+							mes "watch me closely and take note.";
+							next;
+							mes "[Killtin]";
+							mes "You see? Having";
+							mes "good form is essential";
+							mes "to performing flawless";
+							mes "technique. Always basics";
+							mes "before the specifics. Now,";
+							mes "why don't you give it a try?";
+							specialeffect 65; //"Assassin#realman" EF_INVENOM
+							next;
+							mes "[Killtin]";
+							mes "Hey, that's pretty good.";
+							mes "You're catching on really";
+							mes "quick. Heh heh, but still,";
+							mes "I guess I can take a little";
+							mes "bit of credit for my excellent";
+							mes "instruction. Ah, very nice.";
+							next;
+							specialeffect2 65; // EF_INVENOM
+							next;
+							mes "[Killtin]";
+							mes "Alright, you may need";
+							mes "to practice a bit more";
+							mes "of this skill, but for the most";
+							mes "part, you can use Venom";
+							mes "Knife pretty easily in battle.";
+							set ASSN_SK2,1;
+							set ASSN_SK,1;
+							skill 1004,1,0;
+							next;
+							mes "[Killtin]";
+							mes "Well, that's all I can";
+							mes "teach you. Use this skill";
+							mes "expertly, and bring woe to";
+							mes "your enemies for the honor";
+							mes "of the Assassin Guild!";
+							close;
+						}
+						if (.@teach ==1) {
+							mes "[Killtin]";
+							mes "Y-you don't want to";
+							mes "learn? Tough! It's my";
+							mes "job to teach this Venom";
+							mes "Knife skill to every member";
+							mes "of the Assassin Guild! You're^FFFFFFaaaaa^000000 not leaving until I tell you to!";
+							next;
+						}
+						else {
+							mes "[Killtin]";
+							mes "You can't refuse an";
+							mes "order from our guildmaster...";
+							mes "Like it or not, this skill will";
+							mes "make you a better Assassin.";
+							mes "Trust me on this and just agree";
+							mes "to learn the skill, will you?";
+							next;
+						}
+					}
+				}
+			}
+		}
+		else if (BaseJob == Job_Thief) {
+			mes "[Killtin]";
+			mes "A Thief...? Huh.";
+			mes "That's a respectable";
+			mes "job. But listen, if you";
+			mes "want me to be able to";
+			mes "teach you anything, you'll";
+			mes "need to get stronger first.";
+			close;
+		}
+		else {
+			mes "[Assassin]";
+			mes "...............................";
+			mes "Just keep moving.";
+			close;
+		}
+	}
+}
+
+in_moc_16,23,27,5	script	Assassin#realgirl	885,{
+	if (BaseJob == Job_Assassin && ASSN_SK == 7) {
+		if (getskilllv(1003) == 0) {
+			mes "[Esmille]";
+			mes "Mm? Ah, you've transcended";
+			mes "and become an Assassin Cross";
+			mes "as well. I understand the trouble that you must have gone through";
+			mes "to be reborn with new strength.";
+			next;
+			mes "[Esmille]";
+			mes "You probably need to learn";
+			mes "the Sonic Acceleration skill";
+			mes "again after having lost some";
+			mes "of your memories. I truly";
+			mes "sympathize, and am willing";
+			mes "to teach it to you again.";
+			next;
+			if (getskilllv(136) == 0) {
+				mes "[Esmille]";
+				mes "First, go and learn the";
+				mes "Sonic Blow skill. The skill";
+				mes "I will teach you is completely";
+				mes "useless unless you learn how";
+				mes "to perform a Sonic Blow. I shall^FFFFFF ^000000 be waiting right here till then.";
+				close;
+			}
+			mes "[Esmille]";
+			mes "Now, right before you";
+			mes "perform Sonic Blow, make";
+			mes "sure your feet are positioned";
+			mes "like this. Then, as smoothly";
+			mes "and quickly as possible, shift";
+			mes "your weight over to this side.";
+			specialeffect 121; //"Assassin#realgirl" EF_SONICBLOW
+			next;
+			mes "[Esmille]";
+			mes "Watch carefully, this";
+			mes "is the most important";
+			mes "part. See where my hands";
+			mes "are and the angle of my";
+			mes "arms? This is the form that";
+			mes "you've got to memorize.";
+			specialeffect 121; //"Assassin#realgirl" EF_SONICBLOW
+			next;
+			mes "[Esmille]";
+			mes "Alright, that's all";
+			mes "you need to know. Now,";
+			mes "please try it so I can give";
+			mes "you feedback on your form.";
+			next;
+			specialeffect2 121; // EF_SONICBLOW
+			next;
+			mes "[Esmille]";
+			mes "Hmm, you're shifting";
+			mes "your weight kind of";
+			mes "unsteadily. It might";
+			mes "help if your center of";
+			mes "gravity was like this...";
+			next;
+			specialeffect2 121; // EF_SONICBLOW
+			next;
+			mes "[Esmille]";
+			mes "Ah, you're so very";
+			mes "close to perfection.";
+			mes "Focus more on smoothly";
+			mes "transitioning from your";
+			mes "stance to executed action.";
+			next;
+			mes "[Esmille]";
+			mes "Yes, that's it...!";
+			mes "Very well executed.";
+			mes "Good work, "+ strcharinfo(0) +".";
+			skill 1003,1,0;
+			set ASSN_SK,7;
+			next;
+			mes "[Esmille]";
+			mes "Do you understand now?";
+			mes "You should have no problem";
+			mes "remembering this skill now.";
+			mes "I can teach you nothing more,";
+			mes "so all I can do now is wish";
+			mes "you luck on your journeys.";
+			close;
+		}
+		else {
+			mes "[Esmille]";
+			mes "I trust that using";
+			mes "Sonic Acceleration in";
+			mes "battle has given you an";
+			mes "edge over the enemy. Bring";
+			mes "swift defeat to your foes for";
+			mes "the Assassin Guild's honor.";
+			close;
+		}
+	}
+	else if (ASSN_SK == 7) {
+		mes "[Esmille]";
+		mes "I trust that using";
+		mes "Sonic Acceleration in";
+		mes "battle has given you an";
+		mes "edge over the enemy. Bring";
+		mes "swift defeat to your foes for";
+		mes "the Assassin Guild's honor.";
+		close;
+	}
+	else if (ASSN_SK == 6) {
+		mes "[Esmille]";
+		mes "Please focus on the";
+		mes "training... If we continue to";
+		mes "be interrupted, you'll never";
+		mes "be able to learn anything.";
+		mes "Now, please listen closely.";
+		next;
+		mes "[Esmille]";
+		mes "Now, right before you";
+		mes "perform Sonic Blow, make";
+		mes "sure your feet are positioned";
+		mes "like this. Then, as smoothly";
+		mes "and quickly as possible, shift";
+		mes "your weight over to this side.";
+		specialeffect 121; //"Assassin#realgirl" EF_SONICBLOW
+		next;
+		mes "[Esmille]";
+		mes "Watch carefully, this";
+		mes "is the most important";
+		mes "part. See where my hands";
+		mes "are and the angle of my";
+		mes "arms? This is the form that";
+		mes "you've got to memorize.";
+		specialeffect 121; //"Assassin#realgirl" EF_SONICBLOW
+		next;
+		mes "[Esmille]";
+		mes "Alright, that's all";
+		mes "you need to know. Now,";
+		mes "please try it so I can give";
+		mes "you feedback on your form.";
+		next;
+		specialeffect2 121; // EF_SONICBLOW
+		next;
+		mes "[Esmille]";
+		mes "Hmm, you're shifting";
+		mes "your weight kind of";
+		mes "unsteadily. It might";
+		mes "help if your center of";
+		mes "gravity was like this...";
+		next;
+		specialeffect2 121; // EF_SONICBLOW
+		next;
+		mes "[Esmille]";
+		mes "That's a little better.";
+		mes "Hmmm. Try to think of";
+		mes "the enemy's weak point";
+		mes "and follow through with";
+		mes "the stabbing motion.";
+		next;
+		specialeffect2 121; // EF_SONICBLOW
+		next;
+		mes "[Esmille]";
+		mes "Ah, you're so very";
+		mes "close to perfection.";
+		mes "Focus more on smoothly";
+		mes "transitioning from your";
+		mes "stance to executed action.";
+		specialeffect2 121; // EF_SONICBLOW
+		next;
+		mes "[Esmille]";
+		mes "Yes, that's it...!";
+		mes "Very well executed.";
+		mes "Good work, "+ strcharinfo(0) +".";
+		skill 1003,1,0;
+		set ASSN_SK,7;
+		next;
+		mes "[Esmille]";
+		mes "Do you understand now?";
+		mes "You should have no problem";
+		mes "remembering this skill now.";
+		mes "I can teach you nothing more,";
+		mes "so all I can do now is wish";
+		mes "you luck on your journeys.";
+		close;
+	}
+	else if (ASSN_SK == 5) {
+		mes "[Esmille]";
+		mes "So how is your little";
+		mes "mission coming along?";
+		mes "I trust that you've completed";
+		mes "that task I assigned for you.";
+		next;
+		if ((ASSN_SK == 5 && countitem(726) > 0) || (ASSN_SK == 5 && countitem(723) > 0) || (ASSN_SK == 5 && countitem(720) > 0)) {
+			select("How's this for treasure?");
+			mes "[Esmille]";
+			mes "Oh, that jewel...!";
+			mes "It's so captivating~";
+			mes "I haven't seen anything";
+			mes "so beautiful in such a long";
+			mes "time. You've done very well...";
+			next;
+			mes "[Esmille]";
+			mes "That jewel is yours";
+			mes "to keep. In truth, I don't";
+			mes "really need any treasure, just^FFFFFF ^000000 some proof your of qualification.";
+			mes "It looks like you're ready for me^FFFFFF ^000000 to teach you Sonic Acceleration.";
+			set ASSN_SK,6;
+			next;
+			mes "[Esmille]";
+			mes "Now, right before you";
+			mes "perform Sonic Blow, make";
+			mes "sure your feet are positioned";
+			mes "like this. Then, as smoothly";
+			mes "and quickly as possible, shift";
+			mes "your weight over to this side.";
+			specialeffect 121; //"Assassin#realgirl" EF_SONICBLOW
+			next;
+			mes "[Esmille]";
+			mes "Watch carefully, this";
+			mes "is the most important";
+			mes "part. See where my hands";
+			mes "are and the angle of my";
+			mes "arms? This is the form that";
+			mes "you've got to memorize.";
+			specialeffect 121; //"Assassin#realgirl" EF_SONICBLOW
+			next;
+			mes "[Esmille]";
+			mes "Alright, that's all";
+			mes "you need to know. Now,";
+			mes "please try it so I can give";
+			mes "you feedback on your form.";
+			next;
+			specialeffect2 121; // EF_SONICBLOW
+			next;
+			mes "[Esmille]";
+			mes "Hmm, you're shifting";
+			mes "your weight kind of";
+			mes "unsteadily. It might";
+			mes "help if your center of";
+			mes "gravity was like this...";
+			next;
+			specialeffect2 121; // EF_SONICBLOW
+			next;
+			mes "[Esmille]";
+			mes "That's a little better.";
+			mes "Hmmm. Try to think of";
+			mes "the enemy's weak point";
+			mes "and follow through with";
+			mes "the stabbing motion.";
+			next;
+			specialeffect2 121; // EF_SONICBLOW
+			next;
+			mes "[Esmille]";
+			mes "Yes, that's it...!";
+			mes "Very well executed.";
+			mes "Good work, "+ strcharinfo(0) +".";
+			skill 1003,1,0;
+			set ASSN_SK,7;
+			next;
+			mes "[Esmille]";
+			mes "Do you understand now?";
+			mes "You should have no problem";
+			mes "remembering this skill now.";
+			mes "I can teach you nothing more,";
+			mes "so all I can do now is wish";
+			mes "you luck on your journeys.";
+			close;
+		}
+		else {
+			mes "[Esmille]";
+			mes "Hmmm...";
+			close;
+		}
+	}
+	else if (ASSN_SK == 2 || ASSN_SK == 3 || ASSN_SK == 4) {
+		mes "[Esmille]";
+		mes "So how is your little";
+		mes "mission coming along?";
+		mes "If you've forgotten the";
+		mes "location I've asked you to";
+		mes "search for treasure, then";
+		mes "I can briefly remind you.";
+		next;
+		mes "[Esmille]";
+		mes "Find something valuable";
+		if (ASSN_SK == 2) {
+			mes "for me by searching the";
+			mes "^FF0000Coffins^000000 in the Sphinx.";
+		}
+		else if (ASSN_SK == 3) {
+			mes "for me by searching the";
+			mes "^FF0000Stone Statues^000000 in the Sphinx.";
+		}
+		else if (ASSN_SK == 4) {
+			mes "in the ^FF0000flooded crypt in the";
+			mes "bottom floor^000000 of the Pyramids.";
+		}
+		mes "Only the strong can explore";
+		mes "that area, so doing this will";
+		mes "prove your competency to me.";
+		close;
+	}
+	else if (ASSN_SK == 1) {
+		mes "[Esmille]";
+		mes "Ah. Hello, comrade.";
+		mes "Have you heard about";
+		mes "the latest news from";
+		mes "the Assassin Guild?";
+		mes "Ah, you've spoken to";
+		mes "Killtin. Good, good...";
+		next;
+		mes "[Esmille]";
+		mes "Now, I've been charged";
+		mes "with the responsibility of";
+		mes "teaching the Sonic Acceleration skill to all interested Assassins.";
+		mes "I can tell you more about it if";
+		mes "Killtin didn't fully explain.";
+		next;
+		while(1) {
+			switch(select("Please tell me more...:I want to learn Sonic Acceleration!")) {
+			case 1:
+				mes "[Esmille]";
+				mes "Sonic Acceleration is";
+				mes "a ^FF0000support skill used in";
+				mes "conjunction with Sonic Blow^000000.";
+				mes "Assassins can only cast this";
+				mes "skill on themselves for their";
+				mes "own personal benefit.";
+				next;
+				mes "[Esmille]";
+				mes "If you're familiar with";
+				mes "Sonic Blow, you'll know";
+				mes "that it's difficult to inflict";
+				mes "fatal damage with that skill.";
+				mes "It's far too fast to be able";
+				mes "to attack very accurately...";
+				next;
+				mes "[Esmille]";
+				mes "However, by learning";
+				mes "Sonic Acceleration, you";
+				mes "can overcome this accuracy";
+				mes "drawback and fulfill the full";
+				mes "damage potential of the";
+				mes "Sonic Blow skill.";
+				next;
+				mes "[Esmille]";
+				mes "This skill is truly great.";
+				mes "And our guildmaster,";
+				mes "the one who invented this";
+				mes "skill, is also... He's a man";
+				mes "amongst men, I must say.";
+				Emotion e_lv;
+				next;
+				break;
+			case 2:
+				mes "[Esmille]";
+				mes "Ah, I'm glad to see";
+				mes "that you're so enthusiastic";
+				mes "about learning this skill.";
+				mes "But first, there we need to";
+				mes "take care of the prerequisites... ^FFFFFF ^000000";
+				next;
+				if (getskilllv(136) == 0) {
+					mes "[Esmille]";
+					mes "First, go and learn the";
+					mes "Sonic Blow skill. The skill";
+					mes "I will teach you is completely";
+					mes "useless unless you learn how";
+					mes "to perform a Sonic Blow. I shall^FFFFFF ^000000 be waiting right here till then.";
+					close;
+				}
+				mes "[Esmille]";
+				mes "Your task will be to bring";
+				switch(rand(1,3)) {
+				case 1:
+					mes "treasure from the Sphinx.";
+					mes "Search the ^FF0000Coffins^000000 that";
+					mes "are there for precious";
+					mes "valuables. Consider this";
+					mes "a test of your strength.";
+					set ASSN_SK,2;
+					next;
+					mes "[Esmille]";
+					mes "Whether you can complete";
+					mes "this task will determine";
+					mes "if you are worthy enough";
+					mes "for me to teach you the";
+					mes "Sonic Acceleration skill.";
+					mes "Best of luck, and please hurry.";
+					close;
+				case 2:
+					mes "treasure from the Sphinx.";
+					mes "Search the ^FF0000Stone Statues^000000";
+					mes "there for precious valuables.";
+					mes "Consider this excursion as";
+					mes "a test of your strength.";
+					set ASSN_SK,3;
+					next;
+					mes "[Esmille]";
+					mes "Whether you can complete";
+					mes "this task will determine";
+					mes "if you are worthy enough";
+					mes "for me to teach you the";
+					mes "Sonic Acceleration skill.";
+					mes "Best of luck, and please hurry.";
+					close;
+				case 3:
+					mes "treasure from the Pyramids.";
+					mes "Search the ^FF0000flooded crypt at";
+					mes "the bottom floor for precious";
+					mes "valuables^000000. Consider this as";
+					mes "a test of your strength.";
+					set ASSN_SK,4;
+					next;
+					mes "[Esmille]";
+					mes "Whether you can complete";
+					mes "this task will determine";
+					mes "if you are worthy enough";
+					mes "for me to teach you the";
+					mes "Sonic Acceleration skill.";
+					mes "Best of luck, and please hurry.";
+					close;
+				}
+			}
+		}
+	}
+	else {
+		if (BaseJob == Job_Assassin) {
+			mes "[Assassin]";
+			mes "Ah. Hello, comrade.";
+			mes "Have you heard about";
+			mes "the latest news from";
+			mes "the Assassin Guild?";
+			Emotion e_heh;
+			next;
+			select("News from the Assassin Guild?");
+			mes "[Assassin]";
+			mes "Hm. You must not have";
+			mes "heard it, then. If you want";
+			mes "to know more about it, you";
+			mes "should speak to Killtin, who";
+			mes "is right next to me. He will";
+			mes "explain everything clearly.";
+			close;
+		}
+		mes "[Assassin]";
+		mes "Hm. Do you know any";
+		mes "Assassins? Tell them";
+		mes "to come here if they";
+		mes "haven't already.";
+		close;
+	}
+}
+
+in_sphinx2,259,213,0	script	Old Coffin#qsk_as	-1,7,8,{
+OnTouch:
+	if (ASSN_SK == 2) {
+		mes "^3355FFIt's an ancient coffin";
+		mes "with a broken lid that";
+		mes "is slightly ajar. You";
+		mes "momentarily catch a glint";
+		mes "of something shining inside.^000000";
+		specialeffect 71; //"Old Coffin#1" EF_CONE
+		next;
+		while(1) {
+			switch(select("Put your hand inside:Inspect the coffin's opening:Lift the lid:Turn the coffin upside down:Ignore it")) {
+			case 1:
+				mes "^3355FFYou carefully put your";
+				mes "hand inside the coffin";
+				mes "and try to retrieve the";
+				mes "shining object that";
+				mes "you had glimpsed.";
+				mes "...............................^000000";
+				next;
+				mes "^3355FFSomething inside";
+				mes "the coffin bit your";
+				mes "hand really hard!^000000";
+				sc_start SC_Poison,30000,0;
+				sc_start SC_Bleeding,10000,0;
+				Emotion e_omg,1;
+				close;
+			case 2:
+				mes "^3355FFYou try to peek";
+				mes "inside the coffin";
+				mes "through the gap";
+				mes "between the coffin's";
+				mes "edge and the lid.";
+				mes "...............................^000000";
+				next;
+				mes "^3355FFYou're barely able to";
+				mes "perceive that something";
+				mes "is squirming inside the";
+				mes "coffin, but it's far too dark";
+				mes "to see anything else.^000000";
+				sc_start SC_Blind,30000,0;
+				next;
+				break;
+			case 3:
+				mes "^3355FFYou don't have the";
+				mes "strength to move";
+				mes "something as heavy";
+				mes "as this coffin's lid...^000000";
+				sc_start SC_Curse,30000,0;
+				next;
+				break;
+			case 4:
+				mes "^3355FFYou don't have the";
+				mes "strength to turn this";
+				mes "coffin upside down.^000000";
+				next;
+				break;
+			case 5:
+				close;
+			}
+		}
+	}
+}
+
+in_sphinx2,212,267,0	script	Old Coffin#qsk_as	-1,5,6,{
+OnTouch:
+	if (ASSN_SK == 2) {
+		mes "^3355FFIt's an ancient coffin";
+		mes "with a broken lid that";
+		mes "is slightly ajar. You";
+		mes "momentarily catch a glint";
+		mes "of something shining inside.^000000";
+		specialeffect 71; //"Old Coffin#2" EF_CONE
+		next;
+		while(1) {
+			switch(select("Put your hand inside:Inspect the coffin's opening:Lift the lid:Turn the coffin upside down:Ignore it")) {
+			case 1:
+				mes "^3355FFYou carefully put your";
+				mes "hand inside the coffin";
+				mes "and try to retrieve the";
+				mes "shining object that";
+				mes "you had glimpsed.";
+				mes "...............................^000000";
+				next;
+				if (rand(1,3) != 3) {
+					mes "^3355FFYou carefully put your";
+					mes "hand inside the coffin";
+					mes "and try to retrieve the";
+					mes "shining object that";
+					mes "you had glimpsed.";
+					mes "...............................^000000";
+					next;
+					mes "^3355FFSomething inside";
+					mes "the coffin bit your";
+					mes "hand really hard!^000000";
+					sc_start SC_Poison,30000,0;
+					sc_start SC_Bleeding,10000,0;
+					Emotion e_omg,1;
+					close;
+				}
+				else {
+					mes "^3355FFYour fingers manage";
+					mes "to find a solid object";
+					mes "that you pull out of the";
+					mes "coffin. You have obtained";
+					mes "a Sapphire for Esmille.^000000";
+					set ASSN_SK,5;
+					getitem 726,1; //Blue_Jewel
+					close;
+				}
+			case 2:
+				mes "^3355FFYou try to peek";
+				mes "inside the coffin";
+				mes "through the gap";
+				mes "between the coffin's";
+				mes "edge and the lid.";
+				mes "...............................^000000";
+				next;
+				mes "^3355FFYou're barely able to";
+				mes "perceive that something";
+				mes "is squirming inside the";
+				mes "coffin, but it's far too dark";
+				mes "to see anything else.^000000";
+				sc_start SC_Blind,30000,0;
+				next;
+				break;
+			case 3:
+				mes "^3355FFYou don't have the";
+				mes "strength to move";
+				mes "something as heavy";
+				mes "as this coffin's lid...^000000";
+				sc_start SC_Curse,30000,0;
+				next;
+				break;
+			case 4:
+				mes "^3355FFYou don't have the";
+				mes "strength to turn this";
+				mes "coffin upside down.^000000";
+				next;
+				break;
+			case 5:
+				close;
+			}
+		}
+	}
+}
+
+in_sphinx2,13,163,0	script	Stone Statue#qsk_as	-1,7,7,{
+OnTouch:
+	if (ASSN_SK == 3) {
+		specialeffect 71; //"Stone Statue#1" EF_CONE
+		mes "^3355FFThis ancient stone statue";
+		mes "is covered with cracks and";
+		mes "looks close to falling apart.";
+		mes "The glimmer of a shining object";
+		mes "peers out from beneath one of";
+		mes "the feet. The ground appears";
+		mes "soft enough to dig through...^000000";
+		specialeffect 71; //"Old Coffin#2" EF_CONE
+		next;
+		if (select("Dig to retrieve the shining object:Ignore it") == 1) {
+			mes "^3355FFAs your fingers dig into";
+			mes "the soft ground, it emits^000000";
+			if (rand(1,3) != 3){
+				mes "^3355FFa yellow gas that clouds";
+				mes "your senses and briefly";
+				mes "knocks you unconscious.^000000";
+				sc_start SC_Sleep,30000,0;
+				close;
+			}
+			mes "^3355FFa yellow gas. However, you";
+			mes "hold your breath in and expel";
+			mes "all gas in your lungs in time";
+			mes "to escape its effects. You've";
+			mes "retrieved a Ruby for Esmille.^000000";
+			set ASSN_SK,5;
+			getitem 723,1; //Cardinal_Jewel
+		}
+		close;
+	}
+}
+
+in_sphinx2,13,146,0	script	Stone Statue#qsk_as	-1,7,7,{
+OnTouch:
+	if (ASSN_SK == 3) {
+		specialeffect 71; //"Stone Statue#1" EF_CONE
+		mes "^3355FFThis ancient stone statue";
+		mes "is covered with cracks and";
+		mes "looks close to falling apart.";
+		mes "The glimmer of a shining object";
+		mes "peers out from beneath one of";
+		mes "the feet. The ground appears";
+		mes "soft enough to dig through...^000000";
+		specialeffect 71; //"Old Coffin#2" EF_CONE
+		next;
+		if (select("Dig to retrieve the shining object:Ignore it") == 1) {
+			mes "^3355FFAs your fingers dig into";
+			mes "the soft ground, it emits^000000";
+			if (rand(1,3) != 3) {
+				mes "^3355FFa yellow gas that clouds";
+				mes "your senses and briefly";
+				mes "knocks you unconscious.^000000";
+				sc_start SC_Sleep,30000,0;
+				close;
+			}
+			mes "^3355FFa yellow gas. However, you";
+			mes "hold your breath in and expel";
+			mes "all gas in your lungs in time";
+			mes "to escape its effects. Sadly,";
+			mes "all you found was broken glass.^000000";
+			Emotion e_omg,1;
+		}
+		close;
+	}
+}
+
+moc_pryd04,85,96,0	script	¡¡#crypt	-1,3,3,{
+OnTouch:
+	if (ASSN_SK == 4) {
+		specialeffect 71; //"¡¡#crypt" EF_CONE
+		mes "^3355FFThere's something";
+		mes "glimmering beneath";
+		mes "the surface of the water...^000000";
+		next;
+		if (select("Pick it up:Ignore it") == 1) {
+			mes "^3355FFAs soon as you dip your";
+			mes "hand into the water, the";
+			mes "water's freezing chill shoots";
+			mes "up through your arm. You ";
+			mes "better hurry before you freeze!^000000";
+			next;
+			if (rand(1,3) != 3) {
+				mes "^3355FFIt's too late!";
+				mes "Your body has just";
+				mes "been frozen solid.^000000";
+				sc_start SC_Freeze,10000,0;
+				close;
+			}
+			mes "^3355FFYou quickly pick up";
+			mes "the glimmering object";
+			mes "before the water can";
+			mes "freeze you. You obtained";
+			mes "an Aquamarine for Esmille.^000000";
+			set ASSN_SK,5;
+			getitem 720,1; //Skyblue_Jewel
+		}
+		close;
+	}
+}
+
+//============================================================ 
+// Old changelog
+//============================================================ 
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
@@ -19,52 +998,3 @@
 //= 1.3a fixed an item ID typo, thx 2Spiritual Kid
 //= 1.3b Splitted into different files [DracoRPG]
 //============================================================
-
-
-//============================================================
-// ASSASSIN - SONIC ACCELERATION + THROW VENOM KNIFE
-//============================================================
-in_moc_16,14,21,3	script	Kiltin	884,{
-	mes "[Kiltin]";
-	if(BaseJob!=Job_Assassin) goto L_nosin;
-	if(getskilllv(1003) && getskilllv(1004)) goto L_alreadyhave;
-
-	mes "I'll teach you all I know, but";
-	mes "you need to steal some things";
-	mes "for me:";
-	mes "3 Sapphires";
-	mes "1 Ruby";
-	next;
-	
-	mes "[Kiltin]";
-	mes "Let me check your items.";
-	next;
-	
-	if(countitem(726)<3 || countitem(723)<1) goto L_noitems;//Items: Sapphire, Ruby,
-	delitem 726, 3;//Items: Sapphire,
-	delitem 723, 1;//Items: Ruby,
-
-	mes "[Kiltin]";
-	mes "I see you have what you need,";
-	mes "so I'll teach you my talent.";
-	skill 1003,1,0;
-	skill 1004,1,0;
-	close;
-	
-L_noitems:
-	mes "[Kiltin]";
-	mes "You don't have enough items.";
-	mes "Come back when you have all";
-	mes "the required items for me.";
-	close;
-		
-L_nosin:
-	mes "Sorry, but I'm on service of Shadowmen.";
-	emotion e_gasp;
-	close;
-
-L_alreadyhave:
-	mes "I've already taught you";
-	mes "everything I know...";
-	close;
-}
diff --git a/npc/quests/skills/blacksmith_skills.txt b/npc/quests/skills/blacksmith_skills.txt
index 973e1c296..b4a79938b 100644
--- a/npc/quests/skills/blacksmith_skills.txt
+++ b/npc/quests/skills/blacksmith_skills.txt
@@ -3,714 +3,669 @@
 //===== By: ================================================== 
 //= Lupus, Reddozen, Samuray22
 //===== Current Version: ===================================== 
-//= 1.5
+//= 1.6
 //===== Compatible With: ===================================== 
-//= eAthena Revision 3800+
+//= eAthena SVN
 //===== Description: ========================================= 
-//= Oficial quests for new skills for 2nd classes
+//= [Aegis Conversion]
+//= Quests for skills: Dubious Salesmanship, Greed
 //===== Additional Comments: ================================= 
-//= 1.0 for fully working skills only [Lupus]
-//= 1.1 Added more new skill quests for more classes [Lupus]
-//= Somehow eA engine doesn't let you keep learn't skill V_V'
-//= 1.2 Added to correct locations, correct NPC's, fixed
-//= some of the items required and made them into real
-//= quests. [Reddozen] 
-//= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
-//= 1.3a fixed an item ID typo, thx 2Spiritual Kid
-//= 1.3b Splitted into different files [DracoRPG]
-//= 1.3c Inverted the weight check for Greed [DracoRPG]
-//= 1.4 Updated to the official One [Samuray22]
-//= 1.5 replaced item "names" with item id. Fixed a bug with
-//=		item deletion [Lupus]
+//= 1.6 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //============================================================
 
-//============================================================
-// BLACKSMITH SKILL - UNFAIR TRICK
-//============================================================
-//== AKKI - UNFAIR TRICK ===================================
-geffen,178,72,5	script	Akki	726,{
-	if(Class == Job_Whitesmith && BLACK_SK >= 7 && getskilllv(1012) == 0) {
-			mes "[Akki]";
-			mes "Woah~";
-			mes "It's been a really long time~";
-			mes "Maybe it's because you've trained so much";
-			mes "but you are looking good~";
-			mes "I will teach you the skill";
-			mes "you learned before again~";
+geffen,178,72,3	script	Akkie#qsk_bs	726,{
+	if (BaseJob == Job_Blacksmith) {
+		if (BLACK_SK == 7 && getskilllv(1012) == 0) {
+			mes "[Akkie]";
+			mes "I see that you've";
+			mes "transcended since the";
+			mes "last time we've met. Oh...";
+			mes "You must have forgotten";
+			mes "everything I've taught you.";
+			mes "Well, let me teach you again~";
+			next;
+			mes "[Akkie]";
+			mes "Actually, let me jog your";
+			mes "memory with this counterfeit";
+			mes "zeny that we made the last time.^FFFFFF ^000000 Do you remember how to perform";
+			mes "Dubious Salesmanship? You";
+			mes "should be able to use it now...";
+			set BLACK_SK,8;
 			skill 1012,1,0;
-			set BLACK_SK, 8;
 			close;
-		} else if(BLACK_SK == 8) {
-			mes "[Akki]";
-			mes "It's been a long time~";
-			mes "if you find time again";
-			mes "feel free to drop by again~";
-			mes "it's been planned me for to";
-			mes "remain in this spot, hehe~";
-			mes "Then, good luck on our travels.";
-			mes "Bye bye~";
+		}
+		else if (BLACK_SK == 8) {
+			mes "[Akkie]";
+			mes "Hi again~";
+			mes "How has the smithing";
+			mes "been coming along? Anyway,";
+			mes "it was really nice of you to";
+			mes "drop by and talk to me~";
+			next;
+			mes "[Akkie]";
+			mes "It can get a little boring";
+			mes "teaching Dubious Salesmanship";
+			mes "to Blacksmiths and Master Smiths, but somebody from our guild has";
+			mes "to do this job. Anyway, farewell and be safe in your travels, okay?";
 			close;
-	} else if(Class == Job_Whitesmith || Class == Job_Blacksmith) {
-		if(JobLevel > 29) {
+		}
+		if (JobLevel > 29) {
 			if (BLACK_SK == 0) {
-				mes "[Akki]";
-				mes "Hello~";
-				mes "The weather is wonderful today.";
-				mes "In a weather like this,";
-				mes "vending is very good,";
-				mes "but hunting is";
-				mes "extraordinary as well.";
-				next;
-				mes "[Akki]";
-				mes "I am blacksmith Akki,";
-				mes "hired to teach ^ff0000 Unfairly Trick^000000 to fellow smiths";
-				mes "of the Blacksmith";
-				mes "Guild.";
-				next;
-				mes "[Akki]";
-				mes "The quest skill I teach,";
-				mes " -^ff0000Unfairly Trick^000000 is-";
-				mes "-^ff0000a skill that decreases^000000-";
-				mes "-^ff0000zeny required for Mammonite by 10%^000000-";
-				mes "-^ff0000 and it is a passive skill.^000000-.";
-				next;
-				mes "[Akki]";
-				mes "Seeing from a professional's view,";
-				mes " "+strcharinfo(0)+", you will";
-				mes "find this skill useful";
-				mes "if you get it.";
-				next;
-				mes "[Akki]";
-				mes "How is it?";
-				mes "Take a chance and learn it.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes ".............";
-				mes "- Akki appears to be reading-";
-				mes "-to me from a book called-";
-				mes "-'Blacksmith Guild Guide.-";
-				mes "-Can you put your faith in the blacksmith?-";
-				mes "..................";
-				next;
-				switch( select( "Learn it.", "Refuse.")) {
-				case 1:
-					mes "["+strcharinfo(0)+"]";
-					mes "I will learn it.";
-					next;
-					mes "[Akki]";
-					mes "Good choice~!";
-					mes "There is a skill,";
-					mes "a sneaky one, that the guild";
-					mes "was able to produce... hehe~~";
-					next;
-					mes "[Akki]";
-					mes "Well, then I will explain to you";
-					mes "the basics of the skill.";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "-Akki reopens the booklet-";
-					mes "-and starts reading it.-";
-					next;
-					mes "[Akki]";
-					mes "The zeny used in";
-					mes "Mammonite can be saved while";
-					mes "still preserving the power with";
-					mes "the skill.-^ff0000 Unfairly Trick^000000-is";
-					mes "a trick skill that uses counterfeit";
-					mes "zeny for your Mammonite";
-					mes "during battles.";
+				mes "[Akkie]";
+				mes "Hello there~";
+				mes "Isn't it such a";
+				mes "wonderful day today?";
+				mes "It's perfect for hunting!";
+				next;
+				mes "[Akkie]";
+				mes "Um, let me introduce myself.";
+				mes "I'm Akkie, a representative of";
+				mes "the Blacksmith Guild that has";
+				mes "been dispatched to teach the";
+				mes "Dubious Salesmanship skill to";
+				mes "Blacksmiths and Master Smiths.";
+				next;
+				mes "[Akkie]";
+				mes "This additional class";
+				mes "skill enables you to reduce";
+				mes "the amount of zeny spent to";
+				mes "cast Mammonite by 10%. This";
+				mes "Passive skill might come in";
+				mes "handy for you, "+ strcharinfo(0) +".";
+				next;
+				mes "[Akkie]";
+				mes "Although I'm new at";
+				mes "this, would you like";
+				mes "for me to teach you";
+				mes "Dubious Salesmanship?";
+				next;
+				if (select("Sure.:No, thanks.") == 1) {
+					mes "["+ strcharinfo(0) +"]";
+					mes "Sure. I'll try learning this";
+					mes "new skill. Who knows?";
+					mes "It might be really useful.";
 					next;
-					mes "[Akki]";
-					mes "To learn this skill, you must";
-					mes "make counterfeit zeny first,";
-					mes "so get every material";
-					mes "I list and then";
-					mes "come back to me.";
+					mes "[Akkie]";
+					mes "Oh, that's great!";
+					mes "You won't regret this!";
+					mes "Now, let me explain how";
+					mes "this skill works. Um, now";
+					mes "where did I put that-- Ah.";
+					mes "Let me read these guidelines.";
 					next;
-					mes "[Akki]";
-					mes "The items needed are...";
-					mes "One 1 Steel, Five 5 Coal, One 1 Iron Hammer,";
-					mes "And... um... hmm... um...";
-					mes "um~~~~~~~~~~~";
+					mes "[Akkie]";
+					mes "Using Dubious Salesmanship,";
+					mes "we can reduce Mammonite's";
+					mes "zeny cost by 10% by forging";
+					mes "fake zeny to use in the skill.";
+					mes "Since it's against enemies,";
+					mes "we can let the forgery slide.";
 					next;
-					mes "[Akki]";
-					mes "Um~! Just a moment.";
-					mes "I'm still new here...";
-					mes "I underlined it somewhere...";
-					mes "Where is it....";
-					mes "Where is it~?!!!~~~";
+					mes "[Akkie]";
+					mes "Now, I need you to bring";
+					mes "some materials so that I can";
+					mes "demonstrate the forging of";
+					mes "counterfeit zeny. Please";
+					mes "bring me 1 Steel, 5 Coal,";
+					mes "1 Iron Hammer and... and...";
 					next;
-					mes "[Akki]";
-					mes "-She turns pages frantically-";
+					mes "[Akkie]";
+					mes "Um, would you give";
+					mes "me a minute to look";
+					mes "up the information?";
+					mes "I'm sorry about th-this...";
+					mes "^333333(I thought I highlighted this";
+					mes "in the manual. Where is it?)^000000";
 					next;
-					mes "[Akki]";
-					mes "Oh yay, I found it!";
-					mes "Found it, I found it~";
-					mes "Then I will list it again.";
+					mes "[Akkie]";
+					mes "Oh! Oh, I found it!";
+					mes "L-let me start all";
+					mes "over again. Uh...";
 					next;
-					mes "["+strcharinfo(0)+"]";
+					mes "["+ strcharinfo(0) +"]";
 					mes "............";
 					next;
-					mes "[Akki]";
-					mes "1 Steel, 5 Coal, 1 Iron Hammer,";
-					mes "500 zeny to use as prints.";
-					mes "and 1 Detrimindexta required";
-					mes "are listed here, hehe";
+					mes "[Akkie]";
+					mes "^0000FF1 Steel^000000,";
+					mes "^0000FF5 Coal^000000,";
+					mes "^0000FF1 Iron Hammer^000000,";
+					mes "^0000FF500 zeny^000000 and";
+					mes "^0000FF1 Detrimindexta^000000. Would";
+					mes "you bring those, please?";
 					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "-......-";
-					mes "-Could this girl-";
-					mes "-really teach the skill...-";
+					mes "["+ strcharinfo(0) +"]";
+					mes "Sure, sure.";
+					mes "But are you actually";
+					mes "able to teach me this";
+					mes "skill? I mean...";
 					next;
-					mes "[Akki]";
-					mes "Telling by "+strcharinfo(0)+"'s face";
-					mes "you don't seem to trust me!!";
-					mes "You, standing there!!!";
-					mes "Is that really how";
-					mes "you're thinking?!";
+					mes "[Akkie]";
+					mes "Oh no, I knew this was going to";
+					mes "happen! I mean, um, it should";
+					mes "be fine! I've been working here";
+					mes "for 3 months a-and-- Just bring";
+					mes "me the materials and I'll prove";
+					mes "you can learn it e-easily!";
 					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "Yes. That is so.";
-					next;
-					mes "[Akki]";
-					mes "Wahh, of course...";
-					mes "But it's been only";
-					mes "3 months since I joined!!!!!!";
-					mes "I, Akki, do not give up.";
-					mes "Worry not, hang on~!!!";
-					mes "Mwhahahahaha~";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "-......-";
-					next;
-					mes "[Akki]";
-					mes "Just bring the material";
-					mes "and I will teach them to you.";
-					next;
-					mes "[Akki]";
-					mes "Well, then go get the";
-					mes "things I listed~";
-					set BLACK_SK, 1;
-					next;
-					mes "[Akki]";
-					mes "I'll list them again.";
-					mes "1 Steel, 5 Coals";
-					mes "1 Iron Hammer, 500 zeny, 1 Detrimindexta";
-					mes "are needed.";
-					mes "Don't forget~";
-					next;
-					mes "[Akki]";
-					mes "Then~! Go began~!";
-					mes "Meanwhile, I will be eating";
-					mes "this melon bread I bought.";
-					mes "Yum...";
-					close;
-				case 2:
-					mes "[Akki]";
-					mes "Huh? What?!!";
-					mes "You do not trust me";
-					mes "yet?~";
-					next;
-					mes "[Akki]";
-					mes "Waaah! Please learn it~";
-					mes "I will try hard~!!!";
-					mes "Please~ Please~";
-					next;
-					mes "[Akki]";
-					mes "The blacksmith master";
-					mes "told me to raise my";
-					mes "reputation more~";
-					mes "WAaaaah~~~";
-					mes "Just one more time.. I....";
-					mes "Waaaaaah~";
-					next;
-					mes "[Akki]";
-					mes "Too bad.";
-					mes "I'll get in trouble again.";
-					mes "Sobs~";
+					mes "[Akkie]";
+					mes "You've gotta trust me!";
+					mes "You won't be disappointed,";
+					mes "I promise! This skill is sooo";
+					mes "useful! So just bring me those";
+					mes "materials soon, alright?";
+					set BLACK_SK,1;
 					close;
 				}
-			} else if(BLACK_SK == 1) {
-				if(countitem(999) > 0 && countitem(1003) > 4 && countitem(971) > 0 && countitem(613) > 0) {
+				mes "[Akkie]";
+				mes "Wh-what?! But why not?";
+				mes "A-am I not good enough";
+				mes "for you? Please, I promise";
+				mes "to do my best to teach you.";
+				mes "Besides, I've got to reach";
+				mes "my quota for the guild...";
+				close;
+			}
+			else if (BLACK_SK == 1) {
+				if (countitem(999) > 0 && countitem(1003) > 4 && countitem(971) > 0 && countitem(613) > 0) {
 					if (Zeny >= 500) {
-						mes "[Akki]";
-						mes "Oh yay~ you got all the materials?";
-						mes "Let me see them~~";
-						mes "Hmmm~~";
+						mes "[Akkie]";
+						mes "Oh, you came back~";
+						mes "Now let me see if you";
+						mes "brought everything we";
+						mes "need to make counterfeit";
+						mes "zeny so that I can teach";
+						mes "you Dubious Salesmanship.";
 						next;
-						mes "[Akki]";
-						mes "Wow, perfect~";
-						mes "Alright~!!";
-						next;
-						mes "[Akki]";
-						mes "First, I will test";
-						mes "the skill myself with";
-						mes "the materials, so";
-						mes "wait a few";
-						mes "moments~";
-						delitem 1003, 5;
-						delitem 999, 1;
-						delitem 971, 1;
-						delitem 613, 1;
-						set Zeny, Zeny-500;
-						set BLACK_SK, 2;
+						mes "[Akkie]";
+						mes "Good job, it looks like";
+						mes "you've got what we need.";
+						mes "Alright, now please wait";
+						mes "while I get these materials";
+						mes "ready for forging, okay?";
+						delitem 1003,5; //Coal
+						delitem 999,1; //Steel
+						delitem 971,1; //Detrimindexta
+						delitem 613,1; //Iron_Hammer
+						set zeny,zeny-500;
+						set BLACK_SK,2;
+						close;
+					}
+					else {
+						mes "[Akkie]";
+						mes "Hmm, you have all the";
+						mes "forging materials, but";
+						mes "I still need 500 zeny.";
+						mes "We need that zeny to copy,";
+						mes "or we won't be able to make";
+						mes "convincing counterfeit money.";
 						close;
 					}
-					mes "[Akki]";
-					mes "You need 500 zeny to use as prints";
-					mes "but you haven't enough.";
-					mes "Go make yourself 500 zeny~";
+				}
+				else {
+					mes "[Akkie]";
+					mes "Oh, you came back~";
+					mes "Now let me see if you";
+					mes "brought everything we";
+					mes "need to make counterfeit";
+					mes "zeny so that I can teach";
+					mes "you Dubious Salesmanship.";
+					next;
+					mes "[Akkie]";
+					mes "Hmm, you're still";
+					mes "missing a few things.";
+					mes "Let me tell you what you";
+					mes "need to bring me once again";
+					mes "so that we can start training";
+					mes "you in the skill right away.";
+					next;
+					mes "[Akkie]";
+					mes "^0000FF1 Steel^000000,";
+					mes "^0000FF5 Coal^000000,";
+					mes "^0000FF1 Iron Hammer^000000,";
+					mes "^0000FF500 zeny^000000 and";
+					mes "^0000FF1 Detrimindexta^000000.";
+					mes "Don't forget, okay?";
 					close;
 				}
-				mes "[Akki]";
-				mes "Did you get everything?";
-				mes "Hmm, let's see...";
-				mes "Uhoh, you're short~";
-				next;
-				mes "[Akki]";
-				mes "I will say it again,";
-				mes "1 Steel, 5 Coals";
-				mes "1 Iron Hammer, 500 zeny, 1 Detrimindexta";
-				mes "are needed.";
-				mes "Don't forget~";
-				close;
-			} else if(BLACK_SK == 2) {
-				mes "[Akki]";
-				mes "Oh~!!!";
-				mes "You're here again~";
-				mes "........";
-				mes "Um~ Uummmm...";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "............";
-				next;
-				mes "[Akki]";
-				mes "The truth is...";
-				mes "I was making counterfeit";
-				mes "and I failed... WAaah~!";
-				mes "Sorry~ Just don't";
-				mes "tell the guild master~~";
-				mes "Wah wah~";
-				next;
-				mes "[Akki]";
-				mes "Give me one more chance~";
-				mes "I really cann do well~";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Oh really...";
-				next;
-				mes "[Akki]";
-				mes "Please please~";
-				mes "1 Steel and 3 Coals";
-				mes "Get it one more time~";
-				mes "Pleeeaaassseee~";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "I guess...";
-				mes "Is that all you need?";
-				next;
-				mes "[Akki]";
-				mes "Yes~!!! You're a kind person!";
-				mes "You will live a long life~";
-				mes "Hehe~";
+			}
+			else if (BLACK_SK == 2) {
+				mes "[Akkie]";
+				mes "A-ah! You came";
+				mes "back sooner than";
+				mes "I thought. Um, gee.";
+				mes "Hmm. How should";
+				mes "I tell you this?";
+				next;
+				mes "["+ strcharinfo(0) +"]";
+				mes "...";
+				mes "......";
+				mes ".........";
 				next;
-				mes "[Akki]";
-				mes "To say it again,";
-				mes "1 Steel";
-				mes "and 3 Coals~!!!";
-				mes "Good luck, have fun~!!!";
-				mes "Go, go~!!!";
-				set BLACK_SK, 3;
+				mes "[Akkie]";
+				mes "I'm so sorry! I messed";
+				mes "something up while I was";
+				mes "making a counterfeit sample!";
+				mes "I'm so sorry, please d-don't";
+				mes "report me to the Blacksmith";
+				mes "Guild! Give me one more chance!";
+				next;
+				mes "[Akkie]";
+				mes "I promise that next time";
+				mes "I won't mess up! All I need";
+				mes "is 1 Steel and 3 more Coals!";
+				mes "Please d-don't be angry with";
+				mes "me, it was just an accident!";
+				next;
+				mes "["+ strcharinfo(0) +"]";
+				mes "Okay, okay...";
+				mes "Are you sure that's";
+				mes "all you need me to get?";
+				next;
+				mes "[Akkie]";
+				mes "Yes, yes! Oh, thank";
+				mes "you for being so generous!";
+				mes "Just bring me ^FF00001 Steel^000000 and";
+				mes "^FF00003 Coals^000000 and we'll try again!";
+				set BLACK_SK,3;
 				close;
-			} else if(BLACK_SK == 3) {
+			}
+			else if (BLACK_SK == 3) {
 				if (countitem(999) > 0 && countitem(1003) > 2) {
-					mes "[Akki]";
-					mes "Oh~ You brought them~!";
-					mes "Yay~ Really, thanks~";
-					mes "I'll do better this time.";
-					mes "Wait a few moments.";
-					delitem 999, 1;
-					delitem 1003, 3;
-					set BLACK_SK, 4;
+					mes "[Akkie]";
+					mes "Oh, thank you so";
+					mes "much for bringing these";
+					mes "materials. Alright, I'll try";
+					mes "really hard to succeed";
+					mes "this time. Just give me";
+					mes "a minute to prepare...";
+					delitem 999,1; //Steel
+					delitem 1003,3; //Coal
+					set BLACK_SK,4;
 					close;
 				}
-					mes "[Akki]";
-					mes "To list the needed";
-					mes "materials again..";
-					mes "1 Steel and";
-					mes "3 Coals~!";
-					mes "Good luck, have fun~!!!";
-					mes "Go, go~!!!";
+				else {
+					mes "[Akkie]";
+					mes "All I need you to do";
+					mes "is bring me 1 Steel and";
+					mes "3 Coals. Then I should";
+					mes "be able to teach you the";
+					mes "Dubious Salesmanship skill~";
 					close;
-			} else if(BLACK_SK == 4) {
-				mes "[Akki]";
-				mes "...........";
-				mes "........";
-				mes "...........";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "...?";
-				next;
-				mes "[Akki]";
+				}
+			}
+			else if (BLACK_SK == 4) {
+				mes "[Akkie]";
+				mes "......";
 				mes ".........";
-				mes ".......";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "What...no!!!";
-				mes "again?!!!";
+				mes "............";
 				next;
-				mes "[Akki]";
-				mes "Waaah~";
-				mes "While I was forging";
-				mes "the Iron Hammer broke";
-				mes "so I couldn't do it~";
-				mes "Waaaaah sobs~~~~";
+				mes "["+ strcharinfo(0) +"]";
+				mes "...?";
 				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "-I need to get her another Iron Hammer-";
-				mes "-I guess. argh.-";
-				mes "-.......Why is..-";
-				mes "-argh...tiring...-";
-				set BLACK_SK, 5;
+				mes "["+ strcharinfo(0) +"]";
+				mes "Oh no...";
+				mes "Did... Did you...";
+				mes "Did something happen?";
+				next;
+				mes "[Akkie]";
+				mes "*Sniff* I b-broke the";
+				mes "Iron Hammer you gave";
+				mes "me! I c-can't finish forging";
+				mes "this without one! Waaah~";
+				next;
+				mes "["+ strcharinfo(0) +"]";
+				mes "^333333(I guess I should";
+				mes "really bring her a new";
+				mes "^FF0000Iron Hammer^333333, or else";
+				mes "I'll never learn this skill!)^000000";
+				set BLACK_SK,5;
 				close;
-			} else if(BLACK_SK == 5) {
+			}
+			else if (BLACK_SK == 5) {
 				if (countitem(613) > 0) {
-					mes "[Akki]";
-					mes "Oh~!!";
-					mes "You brought it~!";
-					mes "So kind~";
+					mes "[Akkie]";
+					mes "^333333*Sniff*^000000 Did you";
+					mes "r-really bring this";
+					mes "Iron Hammer for me?";
+					mes "Th-thank you for being so";
+					mes "patient with my screwups...";
 					next;
-					mes "[Akki]";
-					mes "Then I will really really";
-					mes "teach you, so just";
-					mes "wait a little~";
-					delitem 613, 1;
-					set BLACK_SK, 6;
+					mes "[Akkie]";
+					mes "Okay, would you";
+					mes "give me a moment?";
+					mes "I'm going to try";
+					mes "one more time.";
+					delitem 613,1; //Iron_Hammer
+					set BLACK_SK,6;
 					close;
 				}
-				mes "[Akki]";
-				mes "Iron Hammer is gone~";
-				mes "Waaah~ What do I do~";
-				mes "If you bring it one more time";
-				mes "I promise to";
-				mes "do my best~";
-				close;
-			} else if(BLACK_SK == 6) {
-				mes "[Akki]";
-				mes "WAAAAAAAAH~!!!";
-				mes "AWwwwwn~";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "OMG~!!!";
-				mes "Not again?!!";
-				next;
-				mes "[Akki]";
-				mes "Tada~!!! Done~!!";
-				mes "Hehehe~!!!";
-				mes "I just wanted to scare you~";
-				mes "haha~";
-				next;
-				mes "[Akki]";
-				mes "I finished the skill";
-				mes "and tested it myself.";
-				mes "Now, with counterfeit I will teach,";
-				mes "-^ff0000 Unfairly Trick^000000-skill";
-				mes "to you, hehe~.";
-				next;
-				mes "[Akki]";
-				mes "As a bonus, after you learn this,";
-				mes "you can go to our teacher";
-				mes "pay a visit to Goodday and have";
-				mes "-^ff0000 Greed^000000- skill taught";
-				mes "to you as well~.";
-				next;
-				mes "[Akki]";
-				mes "Then I will teach you right away...";
-				mes "Lend me a paper to write on";
-				mes "and your ear~";
-				mes "-whisper whisper~ whisper whisper~";
-				next;
-				mes "[Akki]";
-				mes "Use it as I taught you,";
-				mes "hope it'll help.";
-				mes "I apologize for";
-				mes "making so many mistakes";
-				mes "in the process~.";
-				next;
-				mes "[Akki]";
-				mes "Then, if you find time again";
-				mes "come and visit me~";
-				mes "I will probably be stuck here";
-				mes "until I get promoted";
-				mes "elsewhere, hehe~";
-				mes "Then, bon voyage and.";
-				mes "bye bye~";
-				set BLACK_SK, 7;
+				else {
+					mes "[Akkie]";
+					mes "Waah~! I can't believe";
+					mes "I broke the Iron Hammer!";
+					mes "Would you please bring me";
+					mes "another one so that I can";
+					mes "finish this counterfeit zeny and teach you Dubious Salesmanship?";
+					close;
+				}
+			}
+			else if (BLACK_SK == 6) {
+				mes "[Akkie]";
+				mes "Oh, you're back!";
+				mes "Yaaaay, I finally did it!";
+				mes "I finished making a sample";
+				mes "of counterfeit zeny and even";
+				mes "tested it with Mammonite!";
+				next;
+				mes "[Akkie]";
+				mes "Oh, before you learn my";
+				mes "skill, I'm supposed to tell you";
+				mes "that my colleague, Goodman,";
+				mes "can teach you another additional skill known as Greed. So you";
+				mes "may want to look for him later.";
+				next;
+				mes "[Akkie]";
+				mes "Okay, now the first part to";
+				mes "learning Dubious Salesmanship";
+				mes "is making this fake zeny. Watch";
+				mes "this... Isn't it easy? Of course, you can only use this in battle to";
+				mes "reduce Mammonite's zeny cost...";
+				set BLACK_SK,7;
 				skill 1012,1,0;
+				next;
+				mes "[Akkie]";
+				mes "Also, 90% of the cost of";
+				mes "Mammonite has to be real";
+				mes "zeny or the skill will begin";
+				mes "to lose effectiveness. Well,";
+				mes "that's all for the lesson. Now you can use Dubious Salesmanship!";
+				next;
+				mes "[Akkie]";
+				mes "Thanks once again for";
+				mes "putting up with my mistakes,";
+				mes "I know it must have been really";
+				mes "annoying. Anyway, I hope this";
+				mes "skill is really useful for you.";
+				mes "Drop again sometime, okay?";
 				close;
 			}
-				set @teach, rand(1,2);
-				if(@teach == 1) {
-					mes "[Akki]";
-					mes "To achieve the new job quest";
-					mes "-^ff0000Greed^000000- in your list";
-					mes "go visit Goodday at Einbroch's";
-					mes "blacksmith guild~.";
+			else {
+				if (rand(1,2) == 1) {
+					mes "[Akkie]";
+					mes "Oh, have you spoken with";
+					//mes "Goodman in Einbroch yet?";
+					mes "Goodman in Geffen yet?";
+					mes "He's the representative of";
+					mes "the Blacksmith Guild that";
+					mes "teaches the Greed skill.";
+					next;
+					mes "[Akkie]";
+					mes "If you're serious about";
+					mes "smithing goods, the Greed";
+					mes "skill might be very convenient.";
+					mes "Though, I have to say that the";
+					mes "skill's name is a little... Um.";
+					mes "Hmm... It sounds pretty bad~";
 					close;
 				}
-				mes "[Akki]";
-				mes "It's been a while~";
-				mes "I will probably be stuck here";
-				mes "until I get promoted";
-				mes "elsewhere, hehe~";
-				mes "Visit me often~";
-				mes "Then, bon voyage and.";
-				mes "bye bye~";
-				close;
-		}	
-		mes "[Akki]";
-		mes "My name is Akki, was hired by ";
-		mes "the Blacksmith Guild to teach.";
-		mes "and pass down the skills.";
-		mes "I apologize, but";
-		mes ""+strcharinfo(0)+" is listed as low";
-		mes "Job Level. You cannot learn it yet.";
+				else {
+					mes "[Akkie]";
+					mes "Hi again~";
+					mes "How has the smithing";
+					mes "been coming along? Anyway,";
+					mes "it was really nice of you to";
+					mes "drop by and talk to me~";
+					next;
+					mes "[Akkie]";
+					mes "It can get a little boring";
+					mes "teaching Dubious Salesmanship";
+					mes "to Blacksmiths and Master Smiths, but somebody from our guild has";
+					mes "to do this job. Anyway, farewell and be safe in your travels, okay?";
+					close;
+				}
+			}
+		}
+		else {
+			mes "[Akkie]";
+			if (Upper == 1) {
+				mes "Hello, "+ strcharinfo(0) +",";
+				mes "I'm here on behalf of the";
+				mes "Blacksmith Guild to teach you";
+				mes "a new skill. However, your Job";
+				mes "Level is a little low right now";
+				mes "for me to teach you anything...";
+				next;
+				mes "[Akkie]";
+				mes "But practice smithing";
+				mes "a little bit more, and";
+				mes "once you qualify, I'll be";
+				mes "sure to teach you my skill!";
+				mes "Goodbye and good luck~";
+			}
+			else {
+				mes "Hello, I'm Akkie from";
+				mes "the Blacksmith Guild. I'm";
+				mes "here to teach this new skill";
+				mes "to all interested Blacksmiths";
+				mes "and Master Smiths, but it looks";
+				mes "like your Job Level is too low...";
+				next;
+				mes "[Akkie]";
+				mes "I'm sorry, "+ strcharinfo(0) +",";
+				mes "But you'll qualify for the";
+				mes "skill I teach after you";
+				mes "raise your Job Level.";
+				mes "In the meantime, keep";
+				mes "training, alright?";
+			}
+			close;
+		}
+	}
+	else {
+		mes "[Akkie]";
+		mes "Ah, today seems like";
+		mes "a perfect day for forging.";
+		mes "I just feel like going behind";
+		mes "a beautiful waterfall, getting";
+		mes "some high quality materials,";
+		mes "and just hammering things.";
 		close;
 	}
-	mes "[Akki]";
-	mes "Good weather, isn't it?";
-	mes "It is an excellent day for";
-	mes "forging items.";
-	next;
-	mes "[Akki]";
-	mes "I want to go by a shining stream";
-	mes "with ultimate materials and";
-	mes "blazing fire and forget myself";
-	mes "something special~";
-	close;
 }
 
-//============================================================
-// BLACKSMITH SKILL - GREED
-//============================================================
-//== GOODDAY - GREED SKILL ===================================
-geffen,172,52,7	script	Goodday	826,{
-	if(Class == Job_WhiteSmith || Class == Job_Blacksmith) {
-		if(BLACK_SK2 >= 2 && getskilllv(1013) == 0) {
-			mes "[Goodday]";
-			mes "Oh ho~";
-			mes "It's been a long time~";
-			mes "Is it because you transcended?";
-			mes "You look amazing~";
-			mes "I will give you the skill you";
-			mes "learned before again~";
+geffen,172,52,1	script	Goodman#qsk_bs	826,{
+	if (BaseJob == Job_Blacksmith) {
+		if (BLACK_SK2 == 2 && Upper == 1 && getskilllv(1013) == 0) {
+			mes "[Goodman]";
+			mes "Ah, I see that you have";
+			mes "transcended. It gladdens me";
+			mes "to see Blacksmiths become";
+			mes "Master Smiths for the sake";
+			mes "of improving their craft.";
+			next;
+			mes "[Goodman]";
+			mes "Hm? You've forgotten the";
+			mes "Greed skill? You should";
+			mes "remember how to use it now:";
+			mes "just looking at me should";
+			mes "jog the memories you require";
+			mes "to use this skill once again~";
 			skill 1013,1,0;
-			set BLACK_SK2, 3;
+			set BLACK_SK2,3;
 			close;
-		} else if(BLACK_SK2 == 3) {
-			mes "[Goodday]";
-			mes "I wonder if you are using your skill";
-			mes "properly now.";
-			mes "Don't get too greedy as you live";
-			mes "and travel around, looking";
-			mes "and learning new things.";
+		}
+		else if (BLACK_SK2 == 3) {
+			mes "[Goodman]";
+			mes "How is your forging";
+			mes "technique coming along?";
+			mes "When the craft frustrates you,";
+			mes "traveling will offer a good";
+			mes "opportunity to relax, think,";
+			mes "and collect materials.";
 			close;
-		} else if(BLACK_SK2 == 0) {
-			mes "[Goodday]";
-			mes "I am the one who is in charge";
-			mes "of the quest-skills of Blacksmith.";
-			mes "My name is Master Gooday.";
-			mes "Most prefer just Gooday, though.";
-			next;
-			mes "[Goodday]";
-			mes "A new skill was invented with";
-			mes "Merchant Guild. Now, the Blacksmith guild";
-			mes "is having an event to";
-			mes "pass down teh skill to";
-			mes "fellow members.";
-			next;
-			mes "[Goodday]";
-			mes "Because of this event,";
-			mes "We have to send even untrained";
-			mes "blacksmiths out to teach skills.";
-			mes "Causes me intense troubles";
-			mes "sometimes.";
-			next;
-			mes "[Goodday]";
-			mes "Hmm, you look like a Blacksmith yourself.";
-			mes "Why don't you treat yourself to";
-			mes "the new -^ff0000 Greed^000000-skill";
-			mes "today?";
-			mes "Whether you learn or not";
-			mes "is your choice, but I think";
-			mes "it's one very good";
-			mes "skill~";
-			next;
-			mes "[Goodday]";
-			mes "If you want to learn, I will";
-			mes "explain the skill to you and teach";
-			mes "you all the basics of it.";
-			mes "How is it?";
-			next;
-			switch( select( "Sure, I'd like to learn.", "Later~")) {
-			case 1:
-				mes "[Goodday]";
-				mes "Mm, Good thinking.";
-				mes "The newly invented skill";
-				mes "-^ff0000Greed^000000- allows you to";
-				mes "automatically loot the items";
-				mes "not picked up within 5x5 radius";
-				mes "and place them into your inventory.";
-				mes "It's a very useful and convinient skill,";
-				mes "I believe.";
-				next;
-				mes "[Goodday]";
-				mes "While travelling, all kinds of items";
-				mes "including rare and important ones";
-				mes "can be achieved very quickly";
-				mes "and put into your inventory.";
-				mes "Every merchant's dream,";
-				mes "wouldn't you agree?";
-				next;
-				mes "[Goodday]";
-				mes "Since you decided to learn,";
-				mes "before starting, you must";
-				mes "go through a simple test";
-				mes "to see if you qualify.";
-				mes "So listen carefully and follow";
-				mes "directions.";
-				next;
-				mes "[Goodday]";
-				mes "Now, go out and";
-				mes "-^ff0000 Not mattering whether it is^000000-";
-				mes "-^ff0000 Armour, Potion, Misc items, etc^000000-";
-				mes "-^ff0000 Fill your inventory up^000000-";
-				mes "-^ff0000 so that you cannot put^000000-";
-				mes "-^ff0000 anything 500 weight or more into^000000-";
-				mes "-^ff0000 your invenory and^000000-";
-				mes "-^ff0000 return to me.^000000-";
-				next;
-				mes "[Goodday]";
-				mes "That is all that is";
-				mes "required for teh skill.";
-				mes "Now get started.";
-				set BLACK_SK2, 1;
-				close;
-			case 2:
-				mes "[Goodday]";
-				mes "Mm. Is that so?";
-				mes "Ah, it is good to";
-				mes "live your life busy";
-				mes "when you're young.";
-				mes "Just use your time";
-				mes "wisely.";
+		}
+		else {
+			if (BLACK_SK2 == 0) {
+				mes "[Goodman]";
+				mes "Hey. I'm a Blacksmith";
+				mes "skill master sent from the";
+				mes "Blacksmith Guild. Everyone";
+				mes "calls me Goodman. You're";
+				if (Upper == 1)
+					mes "a Master Smith, aren't you?";
+				else
+					mes "a Blackmith, aren't you?";
+				mes "Pffft, rhetorical question.";
+				next;
+				mes "[Goodman]";
+				mes "Good news. I'm in charge of";
+				mes "teaching the skill, developed";
+				mes "by the Blacksmith and Merchant";
+				mes "Guilds, called ^FF0000Greed^000000. It's your";
+				mes "choice whether you learn it,";
+				mes "but I recommend that you do.";
+				next;
+				mes "[Goodman]";
+				mes "If you want, I can start";
+				mes "teaching you the Greed";
+				mes "skill right now. So what";
+				mes "do you say, kid?";
+				next;
+				if (select("Sounds good!:Maybe later~") == 1) {
+					mes "[Goodman]";
+					mes "Heh! Good choice. Now,";
+					mes "the Greed skill automatically";
+					mes "picks up all items in a 5*5";
+					mes "cell area around the caster.";
+					mes "It's handy for picking up clumps^FFFFFF ^000000 of goods from looting monsters.";
+					next;
+					mes "[Goodman]";
+					mes "First thing's first. I need to";
+					mes "test you and see if you qualify";
+					mes "to learn this skill. Go fill your Inventory with any items until";
+					mes "it's so full, you can't put an";
+					mes "item of 500 Weight in it.";
+					next;
+					mes "[Goodman]";
+					mes "When you finish that";
+					mes "task, come back and";
+					mes "talk to me. Alright";
+						mes "then, good luck~";
+					set BLACK_SK2,1;
+					close;
+				}
+				mes "[Goodman]";
+				mes "I see. It's good to be";
+				mes "busy with other things,";
+				mes "but remember that time is ";
+				mes "a commodity, and you should";
+				mes "always spend it doing the most";
+				mes "worthwhile stuff. Understand?";
 				close;
 			}
-		} else if(BLACK_SK2 == 1) {
-			// Check if you can carry 25 golds (Gold weight 20 = 20*25 = 500),
-			if(checkweight(969,25) == 1) { 
-				mes "[Goodday]";
-				mes "Mm~ back already.";
-				mes "Well, without checking, I can tell";
-				mes "you're quite off from";
-				mes "what I asked for.";
-				mes "This is what I wanted.";
-				next;
-				mes "[Goodday]";
-				mes "-^ff0000 Not mattering whether it is^000000-";
-				mes "-^ff0000 Armour, Potion, Misc items, etc^000000-";
-				mes "-^ff0000 Fill your inventory up^000000-";
-				mes "-^ff0000 so that you cannot put^000000-";
-				mes "-^ff0000 anything 500 weight or more into^000000-";
-				mes "-^ff0000 your invenory and^000000-";
-				mes "-^ff0000 return to me.^000000-";
-				close;
+			else if (BLACK_SK2 == 1) {
+				set .@now_weight,MaxWeight-Weight;
+				if (.@now_weight < 5000) {
+					mes "[Goodman]";
+					mes "Back already, eh?";
+					mes "Alright, let me check";
+					mes "the things you're carrying.";
+					mes "Let's see, Inventory, Inventory... ^FFFFFF ^000000";
+					next;
+					mes "[Goodman]";
+					mes "Good work: you pass.";
+					mes "Do you realize now that the";
+					mes "time and experience spent in";
+					mes "gathering these items is worth";
+					mes "more than their prices in zeny?";
+					next;
+					mes "[Goodman]";
+					if (Upper == 1)
+						mes "I believe that Master Smiths";
+					else
+						mes "I believe that Blacksmiths";
+					mes "should first and foremost be";
+					mes "artisans. Being rich and famous";
+					mes "is merely a side effect of that.";
+					if (Upper == 1)
+						mes "Honorable Master Smiths know^FFFFFF ^000000 value is in the craftsmanship...";
+					else
+						mes "Honorable Blacksmiths know^FFFFFF ^000000 value is in the craftsmanship...";
+					next;
+					if (Upper == 1) {
+						mes "[Goodman]";
+						mes "Now, if you don't place too";
+						mes "much importance on an item's";
+						mes "worth in terms of zeny, you'll";
+						mes "be able to let go of them much";
+						mes "more easily. Watch me do this.";
+						mes "See? Now you can do it too.";
+						next;
+					}
+					mes "[Goodman]";
+					mes "The skill you learned is";
+					mes "called Greed, but I hope";
+					mes "you use it in a manner that";
+					mes "is different than its name.";
+					mes "Don't forget that, and I hope";
+					mes "you craft true masterpieces.";
+					skill 1013,1,0;
+					set BLACK_SK2,2;
+					close;
+				}
+				else {
+					mes "[Goodman]";
+					mes "Hm. You've come back";
+					mes "too early. And you didn't";
+					mes "complete the objective that";
+					mes "I set for you. Listen carefully. ^FFFFFF ^000000";
+					next;
+					mes "[Goodman]";
+					mes "Go fill your Inventory";
+					mes "with any items until it";
+					mes "becomes too full to place";
+					mes "an item of 500 weight into it.";
+					mes "When you finish this task,";
+					mes "come back and report to me.";
+					close;
+				}
 			}
-				mes "[Goodday]";
-				mes "Mm, back already?";
-				mes "You came back earlier than expected.";
-				mes "Well, then allow me to see";
-				mes "your bag.";
-				mes "Hmm~~~~~";
-				next;
-				mes "[Goodday]";
-				mes "Ah~ Hmm~";
-				mes "Mm~ You did just as";
-				mes "I asked you to. Good.";
-				mes "Alright, you pass the test.";
-				next;
-				mes "[Goodday]";
-				mes "The time spent and experience";
-				mes "gained while collecting the items";
-				mes "are more important than the";
-				mes "price that comes out when you";
-				mes "sell the items.";
-				mes "I wanted to let you know that.";
-				next;
-				mes "[Goodday]";
-				mes "Of course, as a blacksmith,";
-				mes "you are expected to look at every";
-				mes "item as a possibility to bring you zeny,";
-				mes "but you are also capable";
-				mes "personally of knowledge and";
-				mes "honour, in my opinion.";
-				next;
-				mes "[Goodday]";
-				mes "You may not think the test";
-				mes "and the skill have any relationship";
-				mes "to each other, but.";
-				mes "That was the test and teaching";
-				mes "that my Master passed to me";
-				mes "when I first became a";
-				mes "blacksmith.";
-				next;
-				mes "[Goodday]";
-				mes "There are too many people";
-				mes "trying to gain money";
-				mes "before anything in this world,";
-				mes "and it pains me to see people";
-				mes "living to see only money";
-				mes "in their items and forgetting";
-				mes "about honour and love of life.";
-				next;
-				mes "[Goodday]";
-				mes "Forging items and weapons";
-				mes "that your friends and others need";
-				mes "and travelling the world to";
-				mes "venture out and face danger yourself";
-				mes "to seek the materials for refining";
-				mes "is the purpose and honour";
-				mes "of blacksmith.";
-				next;
-				mes "[Goodday]";
-				mes "The name of the skill";
-				mes "I will give to you is called";
-				mes "-^ff0000 Greed^000000- but";
-				mes "I hope it will be used as";
-				mes "another meaning to you";
-				mes "once you receive it.";
-				next;
-				mes "[Goodday]";
-				mes "Then here is your skill.";
-				skill 1013,1,0;
-				set BLACK_SK2, 2;
+			else {
+				mes "[Goodman]";
+				mes "How have you been using";
+				mes "the Greed skill? Hopefully,";
+				mes "it has been convenient in";
+				mes "your efforts to forge goods";
+				mes "of greater quality for all";
+				mes "of your comrades.";
 				close;
-		} else if(BLACK_SK2 == 2) {
-			mes "[Goodday]";
-			mes "I wonder if you are using your skill";
-			mes "properly now.";
-			mes "Don't get too greedy as you live";
-			mes "and travel around, looking";
-			mes "and learning new things.";
-			close;
+			}
 		}
 	}
-	mes "[Goodday]";
-	mes "On a day like this, I want to put";
-	mes "my backpack on and climb a dangerous";
-	mes "mountain where all kinds of goods lie";
-	mes "and go off collecting them.";
-	mes "Why don't you become a";
-	mes "blacksmith someday?";
+	mes "[Goodman]";
+	mes "I feel like exploring";
+	mes "the mountains to look for";
+	mes "rare and interesting items";
+	mes "that I can use in forging.";
+	mes "For me, that's the greatest";
+	mes "pleasure of being a Blacksmith.";
 	close;
 }
+
+//============================================================ 
+// Old changelog
+//============================================================ 
+//= 1.0 for fully working skills only [Lupus]
+//= 1.1 Added more new skill quests for more classes [Lupus]
+//= Somehow eA engine doesn't let you keep learn't skill V_V'
+//= 1.2 Added to correct locations, correct NPC's, fixed
+//= some of the items required and made them into real
+//= quests. [Reddozen] 
+//= 1.3 Fixed bugs and minor typos. Optimized [Lupus]
+//= 1.3a fixed an item ID typo, thx 2Spiritual Kid
+//= 1.3b Splitted into different files [DracoRPG]
+//= 1.3c Inverted the weight check for Greed [DracoRPG]
+//= 1.4 Updated to the official One [Samuray22]
+//= 1.5 replaced item "names" with item id. Fixed a bug with
+//=		item deletion [Lupus]
+//============================================================
diff --git a/npc/quests/skills/crusader_skills.txt b/npc/quests/skills/crusader_skills.txt
index 210b4ca47..89f8e93f4 100644
--- a/npc/quests/skills/crusader_skills.txt
+++ b/npc/quests/skills/crusader_skills.txt
@@ -3,12 +3,817 @@
 //===== By: ================================================== 
 //= Lupus, Reddozen
 //===== Current Version: ===================================== 
-//= 1.3a
+//= 1.4
 //===== Compatible With: ===================================== 
-//= eAthena Revision 3800+
+//= eAthena SVN
 //===== Description: ========================================= 
-//= Temp quests for new skills for 2nd classes
+//= [Aegis Conversion]
+//= Quests for skills: Shrink
 //===== Additional Comments: ================================= 
+//= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
+//============================================================
+
+geffen,110,117,3	script	Ford#11	752,{
+	if (BaseJob == Job_Crusader) {
+		if (CRUS_SK == 8 && getskilllv(1002) == 0) {
+			mes "[Ford]";
+			mes "Hey, it's been a while~";
+			mes "And you even managed to";
+			mes "become a Paladin. You must";
+			mes "have forgotten how to perform";
+			mes "the Shrink skill, so I'll teach";
+			mes "it to you real quick... There!";
+			set CRUS_SK,10;
+			skill 1002,1,0;
+			close;
+		}
+
+		else if (CRUS_SK == 0) {
+			mes "[Ford]";
+			mes "Damn! Why is it";
+			mes "taking so long?";
+			mes "Ah, finally, you've";
+			mes "arrived! Quick, show me";
+			mes "the ^FF0000report^000000 you've brought!";
+			next;
+			mes "["+ strcharinfo(0) +"]";
+			mes "Excuse me...?";
+			mes "Oh, you must have";
+			mes "mistaken me for someone";
+			mes "else. I really don't know";
+			mes "what you're talking about.";
+			next;
+			mes "[Ford]";
+			mes "What?! You're not one";
+			mes "of the guards stationed";
+			mes "at South Geffen? Oh, this";
+			mes "is horrible. I apologize,";
+			mes "I just assumed since you";
+			if (Upper == 1)
+				mes "were dressed like a Paladin...";
+			else
+				mes "were dressed like a Crusader...";				
+			next;
+			mes "["+ strcharinfo(0) +"]";
+			mes "I'm sorry...";
+			mes "What's happening?";
+			mes "Is something the matter?";
+			mes "I'm an adventurer that";
+			mes "goes by the name, "+ strcharinfo(0) +".";
+			next;
+			mes "[Ford]";
+			mes "Well, I'm Leslie Ford,";
+			mes "commander of the Prontera";
+			mes "Crusader Guardians. We're";
+			mes "charged with the duty of";
+			mes "protecting adventurers and";
+			mes "citizens from evil monsters.";
+			next;
+			mes "[Ford]";
+			mes "There's been a recent surge";
+			mes "in unprovoked violence from";
+			mes "Goblins and they're making";
+			mes "quite a bit of trouble for us.";
+			mes "Our patrols are supposed to";
+			mes "report on their activity to me.";
+			next;
+			mes "[Ford]";
+			mes "However, today's report";
+			mes "hasn't arrived yet, so I'm";
+			mes "starting to fear that something";
+			mes "has happened to the patrol.";
+			mes "Unfortunately, my duties don't";
+			mes "allow me to leave my post.";
+			next;
+			mes "[Ford]";
+			mes "I'm getting desperate,";
+			mes "and I don't have any choice";
+			mes "but to ask for outside help.";
+			mes "Since you're a fellow Crusader,";
+			mes "I want to ask you if you would";
+			mes "please lend me your aid.";
+			next;
+			switch(select("Sure.:I'm sorry, but I'm busy...")) {
+			case 1:
+				mes "[Ford]";
+				mes "Great, thank you so much!";
+				mes "Now, please go and seek";
+				mes "out ^0000FFSloutii^000000 who should be";
+				mes "stationed south of Geffen,";
+				mes "and deliver his report to me.";
+				mes "Your help is a great relief...";
+				set CRUS_SK,1;
+				close;
+			case 2:
+				mes "[Ford]";
+				mes "Hm. I understand.";
+				mes "I do not know what";
+				mes "obligations that you";
+				mes "have right now, but if";
+				mes "your current task isn't";
+				mes "urgent, please reconsider...";
+				close;
+			}
+			close;
+		}
+		else if (CRUS_SK == 1) {
+			mes "[Ford]";
+			mes "Please search for";
+			mes "^0000FFSloutii^000000 in the area south";
+			mes "of Geffen, and he should";
+			mes "give you his report on";
+			mes "his patrol of the Goblins";
+			mes "for you to deliver to me.";
+			close;
+		}
+		else if (CRUS_SK == 2) {
+			mes "[Ford]";
+			mes "Wait, you've met with";
+			mes "Sloutii, but haven't";
+			mes "received his report?";
+			mes "Please go back to him";
+			mes "and bring it to me, it's";
+			mes "imperative that I read it!";
+			close;
+		}
+		else if (CRUS_SK == 3) {
+			mes "[Ford]";
+			mes "Ah, you've returned!";
+			mes "So how is Sloutii?";
+			mes "Is everything all right?";
+			next;
+			mes "["+ strcharinfo(0) +"]";
+			mes "Here, I've brought";
+			mes "this report as soon as";
+			mes "I could! You better read";
+			mes "it, quick! Things seemed";
+			mes "pretty bad when I left...";
+			next;
+			mes "[Ford]";
+			mes "Goodness, there's blood all";
+			mes "over the paper! Let's see...";
+			mes "Oh no. This is an emergency";
+			mes "situation! I need to report this^FFFFFF ^000000 to Sir Arga and request for";
+			mes "backup immediately!";
+			next;
+			mes "["+ strcharinfo(0) +"]";
+			mes "Wait, we need to do";
+			mes "something about Sloutii.";
+			mes "He was wounded by the";
+			mes "Goblins, and I think he's";
+			mes "in serious trouble.";
+			next;
+			mes "[Ford]";
+			mes "The Goblins...?";
+			mes "Oh no, you'll need the";
+			mes "special antidote that you";
+			mes "can get from Father Arthur";
+			mes "to treat the poison in the";
+			mes "knives these Goblins use.";
+			next;
+			mes "[Ford]";
+			mes "While I request for backup,";
+			mes "please go to ^0000FFProntera Church^000000";
+			mes "and ask Father ^0000FFArthur^000000 for his";
+			mes "antidote for Goblin Poison.";
+			mes "If you don't hurry, it might";
+			mes "be too late for Sloutii--!";
+			set CRUS_SK,4;
+			close;
+		}
+		else if (CRUS_SK == 4) {
+			mes "[Ford]";
+			mes "Please hurry and obtain";
+			mes "the antidote for Goblin's";
+			mes "poison from ^0000FFFather Arthur^000000";
+			mes "in ^0000FFProntera Church^000000. Sloutii's";
+			mes "life depends on you now.";
+			close;
+		}
+		else if (CRUS_SK == 5) {
+			mes "[Ford]";
+			mes "You've already met";
+			mes "Father Arthur? Good,";
+			mes "now please hurry and";
+			mes "get the antidote from him.";
+			mes "Without it, Sloutii will slowly";
+			mes "and excruciatingly perish!";
+			close;
+		}
+		else if (CRUS_SK == 6) {
+			mes "[Ford]";
+			mes "You've already met";
+			mes "Father Arthur? Good,";
+			mes "now please hurry and";
+			mes "get the antidote from him.";
+			mes "Without it, Sloutii will slowly";
+			mes "and excruciatingly perish!";
+			close;
+		}
+		else if (CRUS_SK == 7) {
+			mes "[Ford]";
+			mes "Great, you've received";
+			mes "the antidote from Father";
+			mes "Arthur! Now, make haste";
+			mes "and administer it to Sloutii";
+			mes "stationed south of Geffen.";
+			mes "Hurry, every second counts!";
+			close;
+		}
+		else if (CRUS_SK == 8) {
+			mes "[Ford]";
+			mes "I hear that you were";
+			mes "able to save Sloutii.";
+			mes "For that, I am eternally";
+			mes "grateful. We could use more";
+			mes "people like you to serve in the";
+			mes "Prontera Crusader Guardians...";
+			next;
+			mes "[Ford]";
+			mes "I know that you adventurers";
+			mes "prefer not to commit to these";
+			mes "kinds of organizations, but";
+			mes "your help will always be";
+			mes "welcome here. I hope to";
+			mes "see you again someday.";
+			next;
+			mes "[Ford]";
+			mes "Thanks once again,";
+			mes "and I hope to that you";
+			mes "travel in safety. For now,";
+			mes "this is farewell, "+ strcharinfo(0) +".";
+			close;
+			}
+		else if (CRUS_SK == 10) {
+			mes "[Ford]";
+			mes "Hey, it's been a while~";
+			mes "You should come by more";
+			mes "often, and if you're really";
+			mes "interested, you can enlist in";
+			mes "my troops. We can really use";
+			mes "somebody with your expertise.";
+			close;
+			}
+		else {
+			mes "[Ford]";
+			mes "Great, you've received";
+			mes "the antidote from Father";
+			mes "Arthur! Now, make haste";
+			mes "and administer it to Sloutii";
+			mes "stationed south of Geffen.";
+			mes "Hurry, every second counts!";
+			close;
+			}
+	}
+	else {
+		mes "[Ford]";
+		mes "Ah, greetings.";
+		mes "I'm sorry that I cannot";
+		mes "assist you, adventurer,";
+		mes "but I have something";
+		mes "rather urgent to take care";
+		mes "of. Now if you'll excuse me...";
+		close;
+	}
+}
+
+gef_fild13,297,242,3	script	Soldier#277	751,{
+	if (BaseJob == Job_Crusader) {
+		if (Upper == 1 && getskilllv(1002)) {
+			if (CRUS_SK == 8) {
+				mes "[Sloutii]";
+				mes "Hey pal, it's been";
+				mes "a while. I still need";
+				mes "to recuperate from my";
+				mes "wounds, so if you want";
+				mes "to learn Shrink, speak";
+				mes "to Sir Ford, alright?";
+				close;
+			}
+			else if (CRUS_SK == 10) {
+				mes "[Sloutii]";
+				mes "So how's that Shrink";
+				mes "skill working out for you?";
+				mes "Hopefully, it's saved your";
+				mes "life as many times as it's";
+				mes "saved mine. Anyway, I'll";
+				mes "see you around, "+ strcharinfo(0) +"~";
+				close;
+			}
+		}
+		if (CRUS_SK == 1) {
+			mes "[Soldier]";
+			mes "Arrrrrghhh!";
+			mes "M-my legs!";
+			mes "What the hell";
+			mes "have they done";
+			mes "to my legs?!";
+			next;
+			mes "["+ strcharinfo(0) +"]";
+			mes "Wh-what happened?";
+			mes "Were you attacked?";
+			next;
+			mes "[Soldier]";
+			mes "Y-yeah, I was on my way";
+			mes "to report to Sir Ford on my";
+			mes "regular patrol when I was";
+			mes "attacked by these Goblins!";
+			mes "I've got to warn my superiors!";
+			mes "They're going to raid Geffen!";
+			next;
+			mes "["+ strcharinfo(0) +"]";
+			mes "I actually spoke to";
+			mes "Sir Ford! You must be";
+			mes "Sloutii, right? He sent me";
+			mes "to see what happened to you!";
+			next;
+			mes "[Sloutii]";
+			mes "Great, p-perfect timing!";
+			mes "Listen, you've got to send";
+			mes "him this report. I-it contains";
+			mes "details of my patrol and an";
+			mes "urgent request for backup.";
+			mes "U-ugh! We don't have time!";
+			next;
+			mes "["+ strcharinfo(0) +"]";
+			mes "Wait...!";
+			mes "But what about";
+			mes "you? You're hurt...";
+			next;
+			mes "[Sloutii]";
+			mes "I'll be damned if help";
+			mes "is delayed on my account!";
+			mes "Just hurry and get that";
+			mes "report to Sir Ford! Now go!";
+			mes "Now, if I can just get that";
+			mes "report out of my-- OW! N-no...";
+			next;
+			mes "["+ strcharinfo(0) +"]";
+			mes "^333333(He's writhing in pain";
+			mes "so much that he can't even";
+			mes "give me his report. I better";
+			mes "bring him a Red Potion to";
+			mes "alleviate his suffering...)^000000";
+			set CRUS_SK,2;
+			close;
+		}
+		else if (CRUS_SK == 2) {
+			if (countitem(501) > 0) {
+				mes "["+ strcharinfo(0) +"]";
+				mes "Here, please take";
+				mes "this Red Potion.";
+				mes "It just might help...";
+				next;
+				mes "[Sloutii]";
+				mes "Oh, thank goodness!";
+				mes "Arrrgh! Just pour it";
+				mes "into the wound! I-it...";
+				mes "It burns so much! Those";
+				mes "Goblins must've cut me with";
+				mes "something coated in poison!";
+				next;
+				mes "[Sloutii]";
+				mes "Ah... Ahh...";
+				mes "The bleeding hasn't";
+				mes "stopped, but at least";
+				mes "it's better. Here, take";
+				mes "this report now and get it";
+				mes "to Sir Ford. Hurry and go!";
+				next;
+				mes "^3355FFYou received Sloutii's";
+				mes "patrol report. Some of the";
+				mes "pages are smudged with";
+				mes "the blood from his wound.^000000";
+				delitem 501,1; //Red_Potion
+				set CRUS_SK,3;
+				close;
+			}
+			else {
+				mes "[Sloutii]";
+				mes "Hurry and t-take this";
+				mes "report! L-let me just";
+				mes "hand it to you and th--";
+				mes "Arrrrgh! I-I can't move!";
+				mes "It... It just hurts so much!";
+				next;
+				mes "["+ strcharinfo(0) +"]";
+				mes "^333333(I better bring him";
+				mes "a Red Potion, otherwise";
+				mes "I have no hope of getting";
+				mes "that report without hurting him!) ^FFFFFF ^000000";
+				close;
+			}
+		}
+		else if (CRUS_SK == 3) {
+			mes "[Sloutii]";
+			mes "We're running out";
+			mes "of time! Hurry and get";
+			mes "my report to Sir Ford as";
+			mes "soon as you possibly can!";
+			close;
+		}
+		else if (CRUS_SK == 4) {
+			mes "[Sloutii]";
+			mes "Eeearrrgh--!";
+			mes "My l-legs! Everything";
+			mes "is starting to h-hurt!";
+			next;
+			mes "^3355FFSloutii fell unconscious,";
+			mes "and it seems that the wounds";
+			mes "in his legs are causing him";
+			mes "much more suffering.^000000";
+			close;
+		}
+		else if (CRUS_SK == 5) {
+			mes "[Sloutii]";
+			if (upper == 1) {
+				mes "Eeearrrgh--!";
+				mes "My l-legs! Everything";
+				mes "is starting to h-hurt!";
+				next;
+				mes "^3355FFSloutii fell unconscious,";
+				mes "and it seems that the wounds";
+				mes "in his legs are causing him";
+				mes "much more suffering.^000000";
+			}
+			else {
+				mes "........";
+				mes ".........";
+				next;
+				mes "^3355FFSloutii is still";
+				mes "unconscious. He'll";
+				mes "die if his injuries aren't";
+				mes "treated immediately.";
+				mes "You'll have to help him";
+				mes "as quickly as you can.^000000";
+			}
+			close;
+		}
+		else if (CRUS_SK == 6) {
+			mes "[Sloutii]";
+			mes "........";
+			mes ".........";
+			next;
+			mes "^3355FFSloutii is still";
+			mes "unconscious. He'll";
+			mes "die if his injuries aren't";
+			mes "treated immediately.";
+			mes "You'll have to help him";
+			mes "as quickly as you can.^000000";
+			close;
+		}
+		else if (CRUS_SK == 7) {
+			set .@rand,rand(1,5);
+			if (.@rand == 1 || .@rand == 5) {
+				mes "^3355FFYou carefully pour the";
+				mes "Goblin poison antidote";
+				mes "into Sloutii's mouth.";
+				mes "His throat struggles to";
+				mes "swallow the antidote, but";
+				mes "he manages to ingest it.^000000";
+				next;
+				mes "^3355FFMiraculously, the wounds";
+				mes "inflicted by the Goblins";
+				mes "begin to rapidly heal.^000000";
+				next;
+				mes "[Sloutii]";
+				mes "Oh, wh-what happened?";
+				mes "Am... Am I really still alive?";
+				mes "Hey, it's you! You must've";
+				mes "saved my life! I thought";
+				mes "I was going to die for sure!";
+				next;
+				mes "["+ strcharinfo(0) +"]";
+				mes "Well, it's a good thing";
+				mes "I came in time. Sir Ford";
+				mes "had me visit Father Arthur to";
+				mes "make an antidote to save you.";
+				mes "Ah, and I already delivered";
+				mes "your report to Sir Ford.";
+				next;
+				mes "[Sloutii]";
+				mes "Great! Now, let me repay you";
+				mes "by teaching you a special skill";
+				mes "developed by the Prontera Crusader Guardians. Using this skill helped";
+				mes "me survive the attack by those";
+				mes "Goblins. You ready to learn?";
+				next;
+				mes "[Sloutii]";
+				mes "This skill is called";
+				mes "''^0000FFShrink^000000,'' and it will";
+				mes "knock enemies backwards";
+				mes "when you successfully";
+				mes "guard their attacks.";
+				next;
+				mes "[Sloutii]";
+				mes "Now listen closely...";
+				mes "To execute it, you've got";
+				mes "to be able to concentrate";
+				mes "and repel enemies using";
+				mes "the right stance and mindset...";
+				next;
+				mes "[Sloutii]";
+				mes "Great! You learned the";
+				mes "skill! Now, I hope you use";
+				mes "this ability to combat evil";
+				mes "and protect the weak. Ah, and";
+				mes "if I learn any new skills, I'll be sure to teach you right away.";
+				set CRUS_SK,8;
+				skill 1002,1,0;
+				close;
+			}
+			mes "^3355FFYou carefully pour the";
+			mes "Goblin poison antidote";
+			mes "into Sloutii's mouth.";
+			mes "His throat struggles to";
+			mes "swallow the antidote, but";
+			mes "he manages to ingest it.^000000";
+			next;
+			mes "^3355FFUnfortunately, nothing";
+			mes "happened. The antidote";
+			mes "proabably lost its effect";
+			mes "while you were traveling";
+			mes "from Father Arthur to Sloutii.";
+			mes "You've got to return to Father";
+			mes "Arthur and make another one.^000000";
+			set CRUS_SK,9;
+			close;
+		}
+		else if (CRUS_SK == 8 || CRUS_SK == 10) {
+			mes "[Sloutii]";
+			mes "Hey, it's you~";
+			mes "So how have you been?";
+			mes "If you ever get some free";
+			mes "time, come by and maybe";
+			mes "we can practice our swordplay.";
+			close;
+		}
+		else if (CRUS_SK == 9) {
+			mes "^3355FFThe antidote you";
+			mes "previously administered";
+			mes "had no effect. You've got";
+			mes "to try again by returning to";
+			mes "Father Arthur and making";
+			mes "a new antidote for Sloutii.^000000";
+			close;
+		}
+		else {
+			mes "[Sloutii]";
+			mes "Please be careful around";
+			mes "this area. Goblins are known";
+			mes "to attack any humans that";
+			mes "they encounter. And lately,";
+			mes "they've been getting even more violent, so stay on the lookout.";
+			close;
+		}
+	}
+	else {
+		mes "[Sloutii]";
+		mes "Please be careful around";
+		mes "this area. Goblins are known";
+		mes "to attack any humans that";
+		mes "they encounter. And lately,";
+		mes "they've been getting even more violent, so stay on the lookout.";
+		close;
+	}
+}
+
+prt_church,87,127,3	script	Pastor#1011	755,{
+	if (BaseJob == Job_Crusader) {
+		if (Upper == 1 && getskilllv(1002)) {
+			if (CRUS_SK == 8) {
+				mes "[Father Arthur]";
+				mes "Oh, a Paladin now,";
+				mes "are you? Ah, I'm quite";
+				mes "proud of you. After all, I've";
+				mes "known you back when you";
+				mes "were a brave Crusader.";
+				next;
+				mes "[Father Arthur]";
+				mes "I hope that you continue to";
+				mes "use your power to combat";
+				mes "the forces of evil and to";
+				mes "protect the weak. May your";
+				mes "heart guide your actions.";
+				close;
+			}
+			else if (CRUS_SK == 10) {
+				mes "[Father Arthur]";
+				mes "Ah, have you been well?";
+				mes "It is good to see you under";
+				mes "more pleasant circumstances.";
+				mes "Nonetheless, if you think that";
+				mes "I can be of service to you, then please let me know right away.";
+				close;
+			}
+		}
+		if (CRUS_SK == 4) {
+			mes "[Father Arthur]";
+			mes "Greetings.";
+			mes "How may I be of";
+			mes "service to you today?";
+			next;
+			mes "["+ strcharinfo(0) +"]";
+			mes "Someone was wounded";
+			mes "by Goblins, and I was told";
+			mes "by Sir Ford that you're the";
+			mes "only one who can make the";
+			mes "Goblin Poison Antidote.";
+			next;
+			mes "[Father Arthur]";
+			mes "Saints preserve us,";
+			mes "the Goblins are indeed";
+			mes "cruel and merciless!";
+			mes "Unfortunately, I'm fresh";
+			mes "out of Goblin Poison Antidote";
+			mes "and must make it from scratch.";
+			next;
+			mes "["+ strcharinfo(0) +"]";
+			mes "Tell me what you";
+			mes "need to make it, and";
+			mes "I'll bring you all of the";
+			mes "materials right away!";
+			next;
+			mes "[Father Arthur]";
+			mes "Ah, yes. Bring me";
+			mes "^0000FF20 Sticky Mucus^000000,";
+			mes "^0000FF3 Empty Bottles^000000,";
+			mes "^0000FF5 Jellopies^000000...";
+			next;
+			mes "[Father Arthur]";
+			mes "...^0000FF1 Coal^000000,";
+			mes "^0000FF1 Grape^000000,";
+			mes "^0000FF3 Cyfar^000000 and";
+			mes "^0000FF1 Unripe Apple^000000.";
+			mes "Now hurry, he won't";
+			mes "last long if he's poisoned!";
+			set CRUS_SK,5;
+			close;
+		}
+		else if (CRUS_SK == 5) {
+			if (countitem(514) > 0 && countitem(619) > 0 && countitem(1003) > 0 && countitem(7053) > 2 && countitem(713) > 2 && countitem(909) > 4 && countitem(938) > 19) {
+				mes "[Father Arthur]";
+				mes "Ah, you've returned.";
+				mes "Now let me check to";
+				mes "see if you've brought";
+				mes "everything needed to";
+				mes "create the antidote.";
+				next;
+				mes "[Father Arthur]";
+				mes "Good, good. It looks";
+				mes "like everything is ready.";
+				mes "Now, before I begin, I should";
+				mes "tell you that the antidote has";
+				mes "a time limit of effectiveness.";
+				next;
+				mes "[Father Arthur]";
+				mes "However, there's no way";
+				mes "to accurately predict when";
+				mes "the antidote will become";
+				mes "ineffective until you try it.";
+				mes "Therefore, you may have to";
+				mes "return to me for a new batch.";
+				next;
+				mes "[Father Arthur]";
+				mes "These materials should";
+				mes "be enough for multiple";
+				mes "dosages, so you won't have";
+				mes "to worry about collecting";
+				mes "materials again. Now, give";
+				mes "me a moment to distill this...";
+				delitem 938,20; //Sticky_Mucus
+				delitem 619,1; //Unripe_Apple
+				delitem 909,5; //Jellopy
+				delitem 514,1; //Grape
+				delitem 1003,1; //Coal
+				delitem 7053,3; //Cyfar
+				delitem 713,3; //Empty_Bottle
+				set CRUS_SK,6;
+				close;
+			}
+			else {
+				mes "[Father Arthur]";
+				mes "I'm sorry, but these";
+				mes "aren't enough materials";
+				mes "in order for me to distill the";
+				mes "antidote. Hmm, what were";
+				mes "the required materials again?";
+				next;
+				mes "[Father Arthur]";
+				mes "Ah, yes. Bring me";
+				mes "^0000FF20 Sticky Mucus^000000,";
+				mes "^0000FF3 Empty Bottles^000000,";
+				mes "^0000FF5 Jellopies^000000...";
+				next;
+				mes "[Father Arthur]";
+				mes "...^0000FF1 Coal^000000,";
+				mes "^0000FF1 Grape^000000,";
+				mes "^0000FF3 Cyfar^000000 and";
+				mes "^0000FF1 Unripe Apple^000000.";
+				mes "Now hurry, he won't";
+				mes "last long if he's poisoned!";
+				close;
+			}
+		}
+		else if (CRUS_SK == 6) {
+			mes "[Father Arthur]";
+			mes "Your timing must be";
+			mes "divinely inspired: I've";
+			mes "just completed the Goblin";
+			mes "Poison Antidote. Now please";
+			mes "listen very carefully to me...";
+			next;
+			mes "[Father Arthur]";
+			mes "I can't guarantee if this";
+			mes "antidote will work. If it";
+			mes "loses its effectiveness before";
+			mes "you arrive, you'll have to come";
+			mes "back and get a fresh new dose.";
+			next;
+			mes "[Father Arthur]";
+			mes "You've got to hurry over";
+			mes "to the wounded as quickly";
+			mes "as possible. Now, as soon as";
+			mes "I hand this to you, you've got";
+			mes "to run there as fast as you";
+			mes "can: a man's life is at stake!";
+			next;
+			mes "[Father Arthur]";
+			mes "Here, take the";
+			mes "antidote. Now go!";
+			mes "Godspeed, adventurer!";
+			set CRUS_SK,7;
+			close;
+		}
+		else if (CRUS_SK == 7) {
+			mes "[Father Arthur]";
+			mes "You haven't left yet?!";
+			mes "Hurry over to the wounded";
+			mes "and administer the antidote!";
+			mes "You'll have to come back for";
+			mes "a fresh batch of antidote if";
+			mes "you arrive there too late!";
+			close;
+		}
+		else if (CRUS_SK == 8) {
+			mes "[Father Arthur]";
+			mes "Ah, so the antidote";
+			mes "worked and that man is";
+			mes "expected to fully recover?";
+			mes "Good, good. It does my heart";
+			mes "good to hear he's much better.";
+			close;
+		}
+		else if (CRUS_SK == 9) {
+			mes "[Father Arthur]";
+			mes "The antidote failed?!";
+			mes "We have no choice, but";
+			mes "to try it again. Here, let";
+			mes "me quickly distill a new";
+			mes "dosage for you. Wait, wait...";
+			mes "Ah! There! I've finished it!";
+			next;
+			mes "[Father Arthur]";
+			mes "Now take this fresh";
+			mes "antidote and run as";
+			mes "fast as you can to";
+			mes "the wounded! Go!";
+			set CRUS_SK,7;
+			close;
+		}
+		else if (CRUS_SK == 10) {
+			mes "[Father Arthur]";
+			mes "Ah, have you been well?";
+			mes "It is good to see you under";
+			mes "more pleasant circumstances.";
+			mes "Nonetheless, if you think that";
+			mes "I can be of service to you, then please let me know right away.";
+			close;
+		}
+		else {
+			mes "[Father Arthur]";
+			mes "Ah, hello there~";
+			mes "Welcome to Prontera";
+			mes "Church. Please relax here,";
+			mes "enjoy the silence, and invite";
+			mes "spiritual calm into your heart.";
+			close;
+		}
+	}
+	else {
+		mes "[Father Arthur]";
+		mes "Ah, hello there~";
+		mes "Welcome to Prontera";
+		mes "Church. Please relax here,";
+		mes "enjoy the silence, and invite";
+		mes "spiritual calm into your heart.";
+		close;
+	}
+}
+
+//============================================================ 
+// Old changelog
+//============================================================ 
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
@@ -19,89 +824,3 @@
 //= 1.3a fixed an item ID typo, thx 2Spiritual Kid
 //= 1.3b Splitted into different files [DracoRPG]
 //============================================================
-
-
-//============================================================
-// CRUSADER SKILL - SHRINK
-//============================================================
-geffen,110,118,3	script	Ford	752,{
-	mes "[Ford]";
-	if(BaseJob!=Job_Crusader) goto L_nocruz;
-	if(getskilllv(1002)) goto L_alreadyhave;
-	mes "Maybe I'll teach you a little skill";
-	mes "if you bring me a few things...";
-	mes "Bring me these items and we'll";
-	mes "see if I feel like giving it to you.";
-	next;
-	mes "[Ford]";
-	mes "1 Red Potion";
-	mes "20 Sticky Mucus";
-	mes "3 Empty Bottles";
-	mes "5 Jellopies";
-	mes "1 Unripe Apple";
-	mes "1 Grape";
-	mes "1 Coal";
-	mes "3 Cyfars";
-	next;
-	
-	mes "[Ford]";
-	mes "Let me check your items.";
-	next;
-	
-	if(countitem(501)<1 || countitem(938)<20 || countitem(713)<3 || countitem(909)<5 || countitem(619)<1 || countitem(514)<1 || countitem(1003)<1 || countitem(7053)<3)goto L_noitems;//Items: Red_Potion, Sticky_Mucus, Empty_Bottle, Jellopy, Unripe_Apple, Grape, Coal, Cyfar,
-	delitem 501, 1;//Items: Red_Potion,
-	delitem 938, 20;//Items: Sticky_Mucus,
-	delitem 713, 3;//Items: Empty_Bottle,
-	delitem 909, 5;//Items: Jellopy,
-	delitem 619, 1;//Items: Unripe_Apple,
-	delitem 514, 1;//Items: Grape,
-	delitem 1003, 1;//Items: Coal,
-	delitem 7053, 3;//Items: Cyfar,
-	mes "[Ford]";
-	mes "Time to roll my lucky dice.";
-	mes "Good luck, I almost never lose.";
-//TODO: add DICE emotions? 8)
-	emotion e_gg;
-	next;
-	if(rand(1,6)!=3) goto L_lose;
-	emotion 58;
-	next;
-	
-	skill 1002,1,0;
-	mes "[Ford]";
-	mes "I can't believe I lost!";
-	mes "I NEVER lose...";
-	emotion e_sob;
-	close;
-	
-L_noitems:
-	mes "[Ford]";
-	mes "You don't have enough items.";
-	mes "Come back when you have all";
-	mes "the required items for me.";
-	close;
-		
-L_lose:
-	emotion 63;
-	next;
-	mes "[Ford]";
-	mes "I win again!!";
-	mes "I'm not teaching you";
-	mes "anything this time. Come";
-	mes "back if you want to Try";
-	mes "again";
-	close;
-	
-L_nocruz:
-	mes "If you are not a Crusader,";
-	mes "then you have no business";
-	mes "with me...";
-	close;
-	
-L_alreadyhave:
-	mes "Hey, you were lucky I";
-	mes "even taught you the";
-	mes "skill I did! Don't press";
-	mes "your luck.";
-	close;
-}
diff --git a/npc/quests/skills/dancer_skills.txt b/npc/quests/skills/dancer_skills.txt
index c3fa5e40d..dff750206 100644
--- a/npc/quests/skills/dancer_skills.txt
+++ b/npc/quests/skills/dancer_skills.txt
@@ -3,12 +3,727 @@
 //===== By: ================================================== 
 //= Lupus, Reddozen
 //===== Current Version: ===================================== 
-//= 1.3a
+//= 1.4
 //===== Compatible With: ===================================== 
-//= eAthena Revision 3800+
+//= eAthena SVN
 //===== Description: ========================================= 
-//= Temp quests for new skills for 2nd classes
+//= [Aegis Conversion]
+//= Quests for skills: Charming Wink
 //===== Additional Comments: ================================= 
+//= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
+//============================================================
+
+comodo,204,127,5	script	Canell#qsk_dan01	724,{
+	if (BaseJob == Job_Dancer && JobLevel > 39) {
+		if (DANCER_SK == 0) {
+			mes "[Canell]";
+			mes "It's well known that we must";
+			mes "be beautiful to captivate those";
+			mes "who watch us dance. But to rely";
+			mes "on just our outward appearance";
+			mes "is a ghastly waste of our full";
+			mes "potential as performers.";
+			next;
+			mes "[Canell]";
+			mes "Yes, I can tell that you";
+			mes "don't quite understand that";
+			mes "the correct frame of mind is";
+			mes "an essential element to true";
+			mes "beauty. Now tell me, are you";
+			mes "confident in your dancing...?";
+			next;
+			if (select("Of course, old crone!:I... I'm not sure...") == 1) {
+				mes "[Canell]";
+				mes "Ho-ho~ I believe you've";
+				mes "confused confidence with";
+				mes "arrogance! The naive cannot";
+				mes "tell there's a vitally important distinction between the two.";
+				mes "Now... Prepare for punishment!";
+				next;
+				mes "["+ strcharinfo(0) +"]";
+				mes "Ow...!";
+				mes "Th-that whip!";
+				mes "I-i-it huuuurts!";
+				specialeffect2 1; // EF_HIT2
+				percentheal -5,0;
+				close;
+			}
+			mes "[Canell]";
+			mes "Awareness of your own flaws";
+			mes "and faults is the first crucial";
+			mes "step towards improvement.";
+			mes "Yet your obvious neglect of";
+			mes "your gift of dancing is...";
+			mes "grounds for punishment!";
+			next;
+			mes "["+ strcharinfo(0) +"]";
+			mes "What the...? Ack!";
+			mes "S-stop wh-whipping";
+			mes "me! It... It stiiings!";
+			specialeffect2 1; // EF_HIT2
+			percentheal -10,0;
+			next;
+			mes "[Canell]";
+			mes "Ho-ho~! Fortunately for";
+			mes "you, I will teach you what";
+			mes "you must learn to rise above";
+			mes "your current limitations. When";
+			mes "I'm finished with you, angels and demons won't resist your charms~";
+			next;
+			if (select("No way, you're not teaching me!:Alright, I'll see what I can learn.") == 1) {
+				mes "[Canell]";
+				mes "So... You still haven't";
+				mes "mastered the fine art of";
+				mes "exuding charm and humility!";
+				mes "There must be consequences";
+				mes "for this blatant affront to our";
+				mes "profession! Prepare yourself!";
+				next;
+				mes "["+ strcharinfo(0) +"]";
+				mes "Nooooo--!";
+				mes "Not that whip";
+				mes "again! Arrgh, it's--";
+				mes "It hurts so much!";
+				specialeffect2 1; // EF_HIT2
+				percentheal -10,0;
+				close;
+			}
+			mes "[Canell]";
+			mes "Ho-ho~ It's good that you";
+			mes "recognize that you have much";
+			mes "to learn. Well, let's not waste";
+			mes "any time. Your first lesson will^FFFFFF ^000000 be on image training and self";
+			mes "visualization. Now, for that...";
+			next;
+			mes "[Canell]";
+			mes "...You must bring";
+			mes "me ^FF00001 Crystal Mirror^000000!";
+			mes "This tool is imperative";
+			mes "to the lesson, so fetch it";
+			mes "and bring it to me quickly!";
+			set DANCER_SK,1;
+			close;
+		}
+		else if (DANCER_SK == 1) {
+			if (countitem(747) > 0) {
+				mes "[Canell]";
+				mes "Finally, you've come";
+				mes "with the mirror. Now,";
+				mes "look deeply and scrutinize";
+				mes "your reflection. Gaze upon";
+				mes "each blemish and fault, each";
+				mes "charming trait of your face.";
+				next;
+				mes "[Canell]";
+				mes "No face is perfect, but";
+				mes "know that your face is yours";
+				mes "alone, and that it is what gives you a beauty that can be no";
+				mes "one else's. Now, repeat";
+				mes "these truisms after me...";
+				next;
+				mes "[Canell]";
+				mes "''I am beautiful...";
+				mes "I am irresistable...''";
+				next;
+				mes "["+ strcharinfo(0) +"]";
+				mes "I am beautiful...";
+				mes "I am irresistable...";
+				next;
+				mes "[Intoxicated Canell]";
+				mes "Louder!";
+				mes "More feeling!";
+				mes "''I am beautiful!";
+				mes "I am irresistable!";
+				mes "I am the most attractive";
+				mes "woman in the whole world!''";
+				next;
+				mes "["+ strcharinfo(0) +"]";
+				mes "I am beautiful!";
+				mes "I am irresistable!";
+				mes "I am the most attractive";
+				mes "woman in the whole world!";
+				specialeffect2 99; // EF_FLASHER
+				next;
+				mes "^3355FFYour self esteem has";
+				mes "sky rocketed. Fortunately,";
+				mes "you've managed to avoid";
+				mes "becoming a prima donna.^000000";
+				delitem 747,1; //Crystal_Mirror
+				set DANCER_SK,2;
+				close;
+			}
+			else {
+				mes "[Frustrated Canell]";
+				mes "Did I tell you to come";
+				mes "back here without bringing";
+				mes "^FF00001 Crystal Mirror^000000!? Now go";
+				mes "and get it before I find";
+				mes "reason to punish you!";
+				specialeffect 107; //"Canell#qsk_dan01" EF_CLAYMORE
+				close;
+			}
+		}
+		else if (DANCER_SK == 2) {
+			mes "[Canell]";
+			mes "Yes, the first and most";
+			mes "important step to becoming";
+			mes "beautiful is to realize and";
+			mes "accept your gorgeousness.";
+			mes "Confidence first, then beauty.";
+			mes "Never the other way around.";
+			next;
+			mes "[Canell]";
+			mes "Now that you've established";
+			mes "the proper attitude on beauty,";
+			mes "it's time for you to learn an";
+			mes "advanced technique of- shall";
+			mes "we say- enticement. I know an";
+			mes "expert that I highly recommend.";
+			next;
+			mes "[Canell]";
+			mes "Go and find my sister";
+			mes "in Prontera Chruch. If you";
+			mes "mention me by name, she";
+			mes "should be willing to teach";
+			mes "you. I'd do it myself, but I need to enjoy my new Crystal Mirror~";
+			next;
+			mes "^3355FFIt figures that she'd";
+			mes "keep your mirror.^000000";
+			Emotion e_ag,1;
+			set DANCER_SK,3;
+			close;
+		}
+		else if (DANCER_SK > 2 && DANCER_SK < 7) {
+			mes "[Canell]";
+			mes "Ah, such a glamorous";
+			mes "face and figure. My";
+			mes "beauty is incompara--";
+			mes "Oh! It's you. So did my";
+			mes "sister in Prontera Church";
+			mes "teach you anything yet?";
+			Emotion e_go;
+			close;
+		}
+		else if (DANCER_SK == 7) {
+			mes "[Canell]";
+			mes "Ah, so were you";
+			mes "able to find Aelle?";
+			mes "Were you able to learn";
+			mes "anything from her?";
+			next;
+			mes "["+ strcharinfo(0) +"]";
+			mes "Actually, I only learned";
+			mes "about winks, but not so";
+			mes "much as how to do them.";
+			mes "She... She got drunk and";
+			mes "couldn't teach me more.";
+			next;
+			mes "[Canell]";
+			mes "Oh, I should have known";
+			mes "this would happen. Oh,";
+			mes "well, I guess there's no way";
+			mes "around it now. But you should";
+			mes "know that gettng my sister";
+			mes "drunk... is punishable.";
+			next;
+			mes "[Canell]";
+			mes "Bam!";
+			specialeffect2 1; // EF_HIT2
+			percentheal -5,0;
+			next;
+			mes "["+ strcharinfo(0) +"]";
+			mes "?!";
+			mes "What the";
+			mes "hell was that?";
+			next;
+			mes "[Canell]";
+			mes "Now, a true Dancer should";
+			mes "be able to figure out the";
+			mes "secret to winking on her";
+			mes "own. But since I'm such";
+			mes "a kind woman, I will deign";
+			mes "to explain it to you. Ho-ho~";
+			next;
+			mes "^3355FFKind woman...?";
+			mes "But she just hit you!";
+			mes "Lightly, of course, but";
+			mes "still, a smack is a smack.^000000";
+			set DANCER_SK,8;
+			close;
+		}
+		else if (DANCER_SK == 8) {
+			mes "[Canell]";
+			mes "Alright, the secret to";
+			mes "proper winking is to allow";
+			mes "your eyelid to seductively";
+			mes "move to a natural rhythm.";
+			mes "Close your eye for a second,^FFFFFF ^000000 then open it slowly to this count.";
+			next;
+			mes "[Canell]";
+			mes "Un, deux, trois~";
+			mes "Look at me, do it";
+			mes "like this. Un, deux, trois~";
+			mes "Now, let me see you try it.";
+			Emotion e_no1;
+			next;
+			switch(select("Un deux trois~-:Un, doux trois~:Un, deux, trois~")) {
+			default:
+				mes "[Canell]";
+				mes "No, no!";
+				mes "That's wrong,";
+				mes "completely wrong!";
+				mes "Can't you do it right?!";
+				next;
+				mes "["+ strcharinfo(0) +"]";
+				mes "O-ow!";
+				mes "P-please...!";
+				mes "Not the whip again!";
+				specialeffect2 1; // EF_HIT2
+				percentheal -5,0;
+				close;
+			case 3:
+				mes "["+ strcharinfo(0) +"]";
+				mes "Un, deux, trois~";
+				Emotion e_no1,1;
+				specialeffect2 99; // EF_FLASHER
+				next;
+				mes "[Canell]";
+				mes "Great, that's exactly";
+				mes "how you do it. Now,";
+				mes "don't forget, the elements";
+				mes "of rhythm and naturalness";
+				mes "are absolutely essential to";
+				mes "this technique of enticement.";
+				Emotion e_kis;
+				next;
+				mes "[Canell]";
+				mes "Now that you've mastered";
+				mes "the art of winking, you.";
+				mes "should know that you cannot";
+				mes "allure those who are much";
+				mes "stronger than you. So your";
+				mes "winks won't work on everyone.";
+				next;
+				mes "[Canell]";
+				mes "Of course, my winks don't";
+				mes "have that drawback. Ho-ho~";
+				mes "Anyway, it's time for us to part now. I hope that you grow to";
+				mes "become a more glamorous and charming dancer in days to come.";
+				Emotion e_heh;
+				next;
+				mes "^3355FFYou have finally learned";
+				mes "the Charming Wink skill.^000000";
+				set DANCER_SK,9;
+				specialeffect2 253; // EF_ABSORBSPIRITS
+				skill 1011,1,0;
+				close;
+			}
+		}
+		else if (DANCER_SK > 8 && getskilllv(1011)) {
+			mes "[Canell]";
+			mes "Hm...?";
+			mes "Is there anything";
+			mes "more you wanted to";
+			mes "ask me? Ah, you must";
+			mes "be mesmerized by my";
+			mes "beauty, aren't you?";
+			Emotion e_pif;
+			next;
+			mes "[Canell]";
+			mes "Oh, to be so beautiful";
+			mes "must be a sin! I should";
+			mes "work in Prontera Church,";
+			mes "just like my sister, to";
+			mes "pray for forgiveness~";
+			close;
+		}
+
+		else if (DANCER_SK == 9 && getskilllv(1011) == 0) {
+			mes "[Canell]";
+			mes "Hm? Oh, I remember you!";
+			mes "A Gypsy now, I see~ That";
+			mes "look suits you. Now, I'm";
+			mes "sure you've forgotten a few";
+			mes "things since transcending,";
+			mes "am I right? Watch this wink...";
+			next;
+			mes "[Canell]";
+			mes "Remember now? It's all";
+			mes "in the natural, seductive";
+			mes "and rhythmic movement of";
+			mes "the eyelid. I hope you use";
+			mes "your Charming Wink to let";
+			mes "your inner beauty shine~";
+			next;
+			mes "^3355FFYou have learned the";
+			mes "Charming Wink skill.^000000";
+			specialeffect2 253; // EF_ABSORBSPIRITS
+			skill 1011,1,0;
+			close;
+		}
+	}
+	else if (BaseJob == Job_Dancer && JobLevel < 40) {
+		mes "[Canell]";
+		mes "Oh, you're such an";
+		mes "adorable little girl! Ah,";
+		mes "I'm sorry, but when you";
+		mes "become a lady at, oh, I don't";
+		mes "know, Job Level 40, then I'll";
+		mes "be able to teach you something~";
+		close;
+	}
+
+	else if (BaseJob != Job_Dancer) {
+		if (Sex == 0) {
+			mes "[Canell]";
+			mes "Oh, what a cute";
+			mes "little girl~! Such";
+			mes "a chubby lil' belly,";
+			mes "so cuuuuuuuuuuute~";
+			close;
+		}
+		else {
+			mes "[Canell]";
+			mes "Hey there,";
+			mes "handsome~";
+			mes "^333333*Wink~*^000000";
+			Emotion e_kis;
+			specialeffect2 364; // EF_VALLENTINE2
+			next;
+			mes "^3355FFStrangely enough,";
+			mes "her wink has made";
+			mes "your heart throb.^000000";
+			close;
+		}
+	}
+}
+
+prontera,183,333,1	script	Aelle#qsk_dan02	79,{
+	if (BaseJob == Job_Dancer) {
+		if (DANCER_SK == 3) {
+			mes "[Aelle]";
+			mes "Pssst, hey! I got";
+			mes "some cheap, but slightly";
+			mes "illegal, warps to the Orc";
+			mes "Dungeon, Glast Heim";
+			mes "and the Dead Pit. So";
+			mes "you want in on this?";
+			next;
+			mes "["+ strcharinfo(0) +"]";
+			mes "Actually, um, I'm here";
+			mes "to look for somebody.";
+			mes "You wouldn't happen";
+			mes "to know Canelle's";
+			mes "sister, would you?";
+			next;
+			mes "[Aelle]";
+			mes "Ah, so my stuck up";
+			mes "sister sent you, huh?";
+			mes "I should have known,";
+			mes "judging from your clothes.";
+			mes "So you want to become a";
+			mes "more alluring performer, eh?";
+			next;
+			mes "[Aelle]";
+			mes "Awww...";
+			mes "That's disappointing.";
+			mes "So... You didn't come";
+			mes "here to buy these warps?";
+			mes "You sure you don't want any?";
+			set DANCER_SK,4;
+			close;
+		}
+		else if (DANCER_SK == 4) {
+			mes "[Aelle]";
+			mes "Okay, okay...";
+			mes "So you came for me to";
+			mes "teach you some enticement";
+			mes "technique or something, right?";
+			mes "Huh. Well, this lecture I give?";
+			mes "It's long and complicated.";
+			next;
+			mes "[Aelle]";
+			mes "Talking and explaining";
+			mes "all of the intricate details";
+			mes "for so long will definitely";
+			mes "parch my throat. So first, you";
+			mes "gotta bring me a refreshing";
+			mes "drink before we can begin...";
+			next;
+			mes "["+ strcharinfo(0) +"]";
+			mes "Oh... Okay.";
+			mes "Alright, I guess";
+			mes "I can spare a potion";
+			mes "or two, or maybe bring";
+			mes "back a bottle of juic--";
+			next;
+			mes "[Aelle]";
+			mes "Whoa, whoa, none of";
+			mes "that junk! I want to";
+			mes "have a real drink.";
+			mes "You know, something";
+			mes "more... ^FF0000Alcohol^000000ic.";
+			next;
+			mes "[Aelle]";
+			mes "Oh, and I need some";
+			mes "snacks to sustain all of";
+			mes "my teaching energy! Yeah,";
+			mes "some yummy fruit on a plate";
+			mes "and some cookies too!";
+			next;
+			mes "[Aelle]";
+			mes "Soooo, I wanna eat";
+			mes "^FF00001 Apple^000000, ^FF00003 Bananas^000000 and";
+			mes "^FF00005 Well-Baked Cookies^000000. Ah,";
+			mes "make sure you bring ^FF0000China^000000";
+			mes "to serve them on, and don't";
+			mes "forget the ^FF0000Alcohol^000000, okay?";
+			next;
+			mes "[Aelle]";
+			mes "One last thing...!";
+			mes "Don't let anyone here";
+			mes "in the church know what";
+			mes "we're doing. I don't wanna";
+			mes "get in too much trouble!";
+			set DANCER_SK,5;
+			close;
+		}
+		else if (DANCER_SK == 5) {
+			if (countitem(970) > 0 && countitem(512) > 0 && countitem(513) > 2 && countitem(538) > 4 && countitem(736) > 0) {
+				mes "[Aelle]";
+				mes "Great, you've brought";
+				mes "the food! It's a good thing";
+				mes "I'm famished because";
+				mes "I'm going to finish it all!";
+				next;
+				mes "^3355FFAelle devoured the";
+				mes "food like a ravenous,";
+				mes "hungry beast that had";
+				mes "been deprived for too long.^000000";
+				next;
+				mes "[Aelle]";
+				mes "That was sooo good!";
+				mes "I haven't eaten so much";
+				mes "in such a long time! Then";
+				mes "again, you don't get many";
+				mes "chances to pig out in church.";
+				mes "Ah, that's right, the lesson!";
+				next;
+				mes "[Aelle]";
+				mes "Now, the easiest, most";
+				mes "subtle and most appealing";
+				mes "gesture of all time is the";
+				mes "^FF0000wink^000000. It's saved me in times";
+				mes "of crisis, and mastering it";
+				mes "will enhance your charms.";
+				next;
+				mes "[Aelle]";
+				mes "To the untrained eye,";
+				mes "the wink only looks like";
+				mes "a simple movement, right?";
+				mes "You close one eye, and then";
+				mes "you reopen that eye. But if";
+				mes "you do it right... If you...";
+				next;
+				mes "[Aelle]";
+				mes "Oh, it's been so long";
+				mes "since I've had so much";
+				mes "to drink! Ugh, f-feeling";
+				mes "kinda--anyway, j-just close";
+				mes "and yer-- ^333333*burp*^000000 winking";
+				mes "is so so so so eeeeeasy~";
+				next;
+				mes "[Drunken Aelle]";
+				mes "Do it! Copy me as";
+				mes "I do it! Wink, j-just";
+				mes "like this, okay? Y' see?";
+				mes "^333333*Wiiiiiiiiiiiiiink*^000000";
+				Emotion e_no1;
+				next;
+				mes "["+ strcharinfo(0) +"]";
+				mes "Wh-whoa...";
+				mes "That was...";
+				mes "It's so beautiful!";
+				mes "And all with just";
+				mes "a simple wink!";
+				next;
+				mes "[Totally Drunk Aelle]";
+				mes "Y-yea... The...";
+				mes "The secret ish...";
+				mes "*Urp* It'sh in the--";
+				mes "Bwahahahaahah!";
+				mes "It's all spinning!";
+				Emotion e_heh;
+				next;
+				mes "^3355FFIn her drunken stupor,";
+				mes "Aelle pummels you with";
+				mes "her fists and laughs";
+				mes "maniacally to herself.^000000";
+				percentheal -10,0;
+				specialeffect2 1; // EF_HIT2
+				Emotion e_dots,1;
+				delitem 970,1; //Alchol
+				delitem 512,1; //Apple
+				delitem 513,3; //Banana
+				delitem 538,5; //Well_Baked_Cookie
+				delitem 736,1; //White_Platter
+				set DANCER_SK,6;
+				close;
+			}
+			else {
+				mes "[Aelle]";
+				mes "How can you expect";
+				mes "me to teach you anything";
+				mes "if I faint in the middle of";
+				mes "the lesson? That's right,";
+				mes "I'll need some nourishing,";
+				mes "yet delicious, snacks to eat~";
+				next;
+				mes "[Aelle]";
+				mes "Soooo, I wanna eat";
+				mes "^FF00001 Apple^000000, ^FF00003 Bananas^000000 and";
+				mes "^FF00005 Well-Baked Cookies^000000. Ah,";
+				mes "make sure you bring ^FF0000China^000000";
+				mes "to serve them on, and don't";
+				mes "forget the ^FF0000Alcohol^000000, okay?";
+				close;
+			}
+		}
+		else if (DANCER_SK == 6) {
+			mes "["+ strcharinfo(0) +"]";
+			mes "You still haven't told";
+			mes "me the secret to making";
+			mes "a simple wink have so";
+			mes "much provocative charm.";
+			mes "I really need to--";
+			next;
+			mes "[Totally Hammered Aelle]";
+			mes "ZzzZzz... Huh?";
+			mes "Yesh, I know, I'm...";
+			mes "I'm a geeenius, yeah...";
+			mes "...ZzzzZzzzZzZzzzZZZzz...";
+			next;
+			mes "["+ strcharinfo(0) +"]";
+			mes "W-wake up!";
+			mes "I went through";
+			mes "all this trouble to";
+			mes "learn this technique!";
+			next;
+			mes "[Annoyed Aelle]";
+			mes "SHADDUP!";
+			mes "I'M SHLEEEEEPY!";
+			mes "G-go away. Talk to";
+			mes "Canell, my sister...";
+			mes "...ZzzzzZzZZZzzzZZ....";
+			set DANCER_SK,7;
+			close2;
+			warp "prontera",156,272;
+			end;
+		}
+		else if (DANCER_SK > 6 && DANCER_SK < 8) {
+			mes "["+ strcharinfo(0) +"]";
+			mes "Aelle, I really";
+			mes "need you to teach";
+			mes "me everything else";
+			mes "I need to know about";
+			mes "winking and--";
+			next;
+			mes "[Aelle]";
+			mes "^333333*Hiccup*^000000 Zzz--wha?";
+			mes "I need ta teach you";
+			mes "to go'way. Talk to my";
+			mes "sister, too tired now.";
+			mes "Go lemme alone girl!";
+			close2;
+			warp "prontera",156,272;
+			end;
+		}
+		else if (DANCER_SK > 8) {
+			mes "[Sober Aelle]";
+			mes "Ohhh...";
+			mes "H-headache...";
+			Emotion e_an;
+			next;
+			mes "[Aelle]";
+			mes "Oh, wow, look at you!";
+			mes "I can tell that you've";
+			mes "become much more";
+			mes "beautiful. Yes, you're";
+			mes "more elegant and refined";
+			mes "than I can remember.";
+			next;
+			mes "[Aelle]";
+			mes "Always believe in your";
+			mes "beauty, wield your charm";
+			mes "like a weapon... And anything";
+			mes "you desire in this world can";
+			mes "be yours! Bwahahahahaha!";
+			close;
+		}
+		else {
+			mes "[Aelle]";
+			mes "Pssst, hey! I got";
+			mes "some cheap, but slightly";
+			mes "illegal, warps to the Orc";
+			mes "Dungeon, Glast Heim";
+			mes "and the Dead Pit. So";
+			mes "you want in on this?";
+			next;
+			mes "[??????]";
+			mes "Sister Aelle...";
+			mes "Are you still trying";
+			mes "to sell illegal warps";
+			mes "again? Sister Aelle?";
+			next;
+			mes "[Aelle]";
+			mes "Oh crap, it's the pastor!";
+			mes "Shhh, if anybody asks you,";
+			mes "I wasn't doing anything!";
+			Emotion e_omg;
+			next;
+			mes "[Aelle]";
+			mes "Thanks, hon...";
+			mes "I know you can";
+			mes "keep my contraband";
+			mes "our little secret. ^333333*Wink*^000000";
+			Emotion e_no1;
+			close;
+		}
+	}
+	else {
+		mes "[Aelle]";
+		mes "Pssst, hey! I got";
+		mes "some cheap, but slightly";
+		mes "illegal, warps to the Orc";
+		mes "Dungeon, Glast Heim";
+		mes "and the Dead Pit. So";
+		mes "you want in on this?";
+		next;
+		mes "[??????]";
+		mes "Sister Aelle...";
+		mes "Are you still trying";
+		mes "to sell illegal warps";
+		mes "again? Sister Aelle?";
+		next;
+		mes "[Aelle]";
+		mes "Oh crap, it's the pastor!";
+		mes "Shhh, if anybody asks you,";
+		mes "I wasn't doing anything!";
+		Emotion e_omg;
+		next;
+		mes "[Aelle]";
+		mes "Thanks, hon...";
+		mes "I know you can";
+		mes "keep my contraband";
+		mes "our little secret. ^333333*Wink*^000000";
+		Emotion e_no1;
+		close;
+	}
+}
+
+//============================================================ 
+// Old changelog
+//============================================================ 
 //= 1.0 for fully working skills only [Lupus]
 //= 1.1 Added more new skill quests for more classes [Lupus]
 //= Somehow eA engine doesn't let you keep learn't skill V_V'
@@ -19,56 +734,3 @@
 //= 1.3a fixed an item ID typo, thx 2Spiritual Kid
 //= 1.3b Splitted into different files [DracoRPG]
 //============================================================
-
-
-//============================================================
-// DANCER - WINK OF CHARM
-//============================================================
-comodo,205,171,7	script	Chanel	724,{
-	mes "[Chanel]";
-	if(BaseJob!=Job_Dancer) goto L_nodancer;
-	if(getskilllv(1011)) goto L_alreadyhave;
-	mes "I'll teach you all I know for:";
-	mes "1 Crystal Mirror";
-	mes "1 Alcohol";
-	mes "1 China";
-	mes "1 Apple";
-	mes "3 Bananas";
-	mes "5 Well-baked Cookies";
-	next;
-	
-	mes "[Chanel]";
-	mes "Let me check your items.";
-	next;
-	
-	if(countitem(747)<1 || countitem(970)<1 || countitem(736)<1 || countitem(512)<1 || countitem(513)<3 || countitem(538)<5) goto L_noitems;//Items: Crystal_Mirror, Alcohol, China, Apple, Banana, Well-baked_Cookie,
-	delitem 747, 1;//Items: Crystal_Mirror,
-	delitem 970, 1;//Items: Alcohol,
-	delitem 736, 1;//Items: China,
-	delitem 512, 1;//Items: Apple,
-	delitem 513, 3;//Items: Banana,
-	delitem 538, 5;//Items: Well-baked_Cookie,
-
-	mes "[Chanel]";
-	mes "I see you have what you need,";
-	mes "so I'll teach you my talent.";
-	skill 1011,1,0;
-	close;
-	
-L_noitems:
-	mes "[Chanel]";
-	mes "You don't have enough items.";
-	mes "Come back when you have all";
-	mes "the required items for me.";
-	close;
-		
-L_nodancer:
-	mes "Hum... you don't seem to be a musician";
-	emotion e_gasp;
-	close;
-
-L_alreadyhave:
-	mes "I've already taught you";
-	mes "everything I know...";
-	close;
-}