Updated Acolyte, Swordman, and Novice quest skill NPCs.

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

3 files changed, 976 insertions, 691 deletions

diff --git a/npc/quests/skills/acolyte_skills.txt b/npc/quests/skills/acolyte_skills.txt
index 455b43193..84cfc6db0 100644
--- a/npc/quests/skills/acolyte_skills.txt
+++ b/npc/quests/skills/acolyte_skills.txt
@@ -1,129 +1,97 @@
-//===== eAthena Script =======================================
-//= Acolyte Skill Quest
-//===== By: ==================================================
-//= kobra_k88
-//===== Current Version: =====================================
-//= 1.4a
-//===== Compatible With: =====================================
-//= eAthena 7.15 +
-//===== Description: =========================================
-//= <Description> 
-//===== Additional Comments: =================================
-//= v1.0a Now using functions found in "Global_Functions.txt"
-//= for class checks.
-//= 1.2 Added Baby Class Support [Lupus]
-//= 1.3 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
-//= 1.4 Fixed an exploit [Lupus]
-//= 1.4a changed perm. variables to temp ones [Lupus]
-//============================================================
-
-
-prt_church,173,23,4	script	Acolyte Klift	79,{
+prt_church,173,23,4	script	Cleric#qsk_al	79,{
 	mes "[Acolyte Klift]";
-	if (baseClass == Job_Acolyte) goto L_Start;
-
-L_Other:
-	mes "Ah, welcome to the Prontera Church also known as the Sanctuary.";
-	mes "Unfortunately I cannot be of much help to you.  For my fellow";
-	mes "Priests and Acolytes however, I can help them to find their ^5555FF'hidden";
-	mes "ability'^000000.";
-	close;
-
-L_Start:
-	if(@HOLYLIGHT) goto L_Check;
-	if(getskilllv(156)>0) goto L_GotSkill;
-	if(sex==1) mes "Ahh... Brother!";
-	if(sex==0) mes "Ahh... Sister!";
-	mes "Does the task of caring for our lost sheep tire you out? Is it too";
-	mes "much of a burden? Do not despair, I am here to assist you.";
+	mes "Ahh . Brothers ! Does the task of";
+	mes "caring for out lost sheep burden";
+	mes "and tire you ?";
+	mes "I am here to assist you.";
 	next;
-	menu "About an Acolyte's ^5555FF'hidden ablitiy'^000000...",M_0, "End Conversation.",M_End;
-
-	M_0:
+	switch(select("^3355FF' About acolyte's hidden ability '^000000 ..:^3355FF' Holy light '^000000 training:End conversation")) {
+	case 1:
 		mes "[Acolyte Klift]";
-		mes "Faced with great danger in an endless struggle with evil, our";
-		mes "brethren are in much need of assistance.";
+		mes "Our members of the clergy";
+		mes "naturally learn a skill as";
+		mes "as they mature. As they approach ";
+		mes "their senior years as an acolyte";
+		mes "this special skill.";
 		next;
 		mes "[Acolyte Klift]";
-		mes "As acolytes approach their senior years in the clergy, they learn to";
-		mes "call upon their inner power to use a special skill to aid them in";
-		mes "battle.";
+		mes "Faced with great danger and";
+		mes "an endless struggle with evil,";
+		mes "our brethren are much in need of assistance.";
+		mes "^3355FF' Holy Light '^000000 is that skill.";
+		mes "To gain this ability for yourself,";
+		mes "takes some work.";
 		next;
 		mes "[Acolyte Klift]";
-		mes "That skill is ^5555FF'Holy Light'^000000.  Holy Light does damage to";
-		mes "all foes but is even more effective on the undead.";
+		mes "To gain the skill, you must find these items.";
+		mes "^FF33551 Opal^000000";
+		mes "^FF33551 Crystal Blue^000000";
+		mes "^FF33551 Rosary^000000 ";
 		next;
 		mes "[Acolyte Klift]";
-		mes "For someone like yourself to learn this skill, takes some hard work.";
-		mes "Would you like to learn this skill?";
+		mes "In order to be able to even use this skill,";
+		mes "one must be have sufficient experience.";
+		mes "^FF3355 Job Level 30^000000";
+		mes "is required to learn this skill.";
 		next;
-		menu "Yes, please.",-, "Let me think about it.",M_End;
-
+		mes "[Acolyte Klift]";
+		mes "As for a priest, because of their";
+		mes "already vast amount of experience,";
+		mes "they are able to gain this skill at any";
+		mes "job level.";
+		close;
+	case 2:
+		if (getskilllv(156) == 1) {
 			mes "[Acolyte Klift]";
-			mes "Very good.  You will need to find these items in order to learn the";
-			mes "skill:";
-			mes "^5555FF1 Opal^000000,";
-			mes "^5555FF1 Crystal Blue^000000,";
-			mes "and ^5555FF1 Rosary^000000.";
-			next;
+			mes "Brother, you already possess";
+			mes "the skill of ` Holy Light '.";
+			mes "You cannot gain a skill you";
+			mes "already possess ..";
+			mes "I pray that you are using";
+			mes "this skill for the work of good . .";
+			close;
+		}
+		else {
+			if (countitem(727) > 0 && countitem(991) > 0 && countitem(2608) > 0) {
+				if ((JobLevel > 29 && BaseJob == Job_Acolyte) || BaseJob == Job_MOnk || BaseJob == Job_Priest) {
+					mes "[Acolyte Klift]";
+					mes "Your faith has proven worthy";
+					mes "for you to gain the ' Holy Light ' skill.";
+					mes "Your skill is adequate";
+					mes "to use this skill.";
+					mes "Use it wisely. . .";
+					next;
+					delitem 727,1; //White_Jewel
+					delitem 991,1; //Crystal_Blue
+					delitem 2608,1; //Rosary
+					skill 156,1,0;
+					mes "[Acolyte Klift]";
+					mes "You now know ' Holy Light '";
+					mes "May you use this skill only in the";
+					mes "best conduct . . . . .";
+					close;
+				}
+			}
 			mes "[Acolyte Klift]";
-			mes "Of course you will also need to have a sufficient level of";
-			mes "experience.  Namely a ^5555FFjob level of at least 30^000000.  This does";
-			mes "not apply to Priests or Monks however, because of the vast amount of";
-			mes "experience they already have.";
+			mes "Oh, it is clear. . .";
+			mes "You are not yet ready to";
+			mes "receive the ' Holy Light ' skill.";
 			next;
 			mes "[Acolyte Klift]";
-			mes "Come back when you are ready.  I will be here.";
-			set @HOLYLIGHT, 1;
+			mes "You should listen carefully to what";
+			mes "is necessary for this skill.";
+			mes "If you listen closely,";
+			mes "you may learn what you lack.";
+			mes "So that you may improve upon yourself.";
 			close;
-	M_End:
+		}
+	case 3:
 		mes "[Acolyte Klift]";
-		mes "I understand your zeal.  You have much time yet to practice and gain";
-		mes "experience.  Go forth with many blessings...";
-		close;
-
-L_Check:
-	mes "So, are you ready for the Holy Light training? Let me check....";
-	next;
-	mes "[Acolyte Klift]";
-	if(BaseJob==Job_Acolyte && JobLevel<30) goto L_LowLvl;
-	if(countitem(727)<1 || countitem(991)<1 || countitem(2608)<1) goto L_NoItems;
-	delitem 727,1;
-	delitem 991,1;
-	delitem 2608,1;
-	mes "Oh! Very good.  You have brought back all of the items I asked for.";
-	next;
-	mes "[Acolyte Klift]";
-	mes "Ok lets get started...";
-	next;
-	mes "(after hours of praying and meditation)";
-	next;
-	mes "[Acolyte Klift]";
-	mes "Yes! I feel it. You have released your hidden abilities and can now";
-	mes "use ^5555FFHoly Light^000000!";
-	skill 156,1,0;
-	set @HOLYLIGHT, 0;
-	next;
-	mes "[Priest]";
-	mes "You have done well.  May God bless you!";
-	emotion e_no1;
-	close;
-
-	L_LowLvl:
-		mes "I'm sorry but you need more training before I can teach you Holy";
-		mes "Light.  Come back when your job level is at least 30.";
-		close;
-	L_NoItems:
-		mes "I'm sorry but you don't have the required items for Holy Light.";
-		mes "You need:";
-		mes "^5555FF1 Opal^000000,";
-		mes "^5555FF1 Crystal Blue^000000,";
-		mes "and ^5555FF1 Rosary^000000.";
+		mes ". . . . .";
+		mes "I understand your zeal.";
+		mes "You have much time yet to";
+		mes "practice and gain experience.";
+		mes "Blessings upon you . . . . .";
 		close;
-
-L_GotSkill:
-	mes "Ah, I see you have been using Holy Light.  It is such a great skill";
-	mes "that I truly believe it to be a gift from the lord himself.  May";
-	mes "God be with you always.";
-	close;
+	}
 }
diff --git a/npc/quests/skills/novice_skills.txt b/npc/quests/skills/novice_skills.txt
index 509edacdd..dff85403d 100644
--- a/npc/quests/skills/novice_skills.txt
+++ b/npc/quests/skills/novice_skills.txt
@@ -1,246 +1,468 @@
-//===== eAthena Script ======================================= 
-//= Novice Skills Quests
-//===== By: ================================================== 
-//= kobra_k88
-//===== Current Version: ===================================== 
-//= 1.4b
-//===== Compatible With: ===================================== 
-//= eAthena 7.15 +
-//===== Description: ========================================= 
-//= Customized novice skills quest
-//===== Additional Comments: ================================= 
-//= Fully working
-//= 1.2 Added Baby Class Support [Lupus]
-//= 1.3 Fixed a Zeny exploit, made more variables clear
-//= on finishing quests. [Lupus]
-//= 1.4 Fixed exploits [Lupus]
-//= 1.4a Fixed some typos [IVBela]
-//============================================================ 
-
-
-
-//<---------------------------------------------------------------------------------------------- Nurse Aid: First Aid NPC ---------------------------------------------------------------------------->\\
-prt_in,235,133,4	script	Nurse Aid	90,{
-	mes "[Nurse Aid]";
-	if(FIRSTAID){
-		if((JobLevel <  3) || (countitem(507) < 5 ) || (countitem(705) < 5) || (countitem(930) < 1)) goto sM_Yes;
-		delitem 507,5;
-		delitem 705,5;
-		delitem 930,1;
-		mes "Oh good.  You have everything needed for me to teach you first aid.  Here we go...";
+prt_in,234,133,4	script	Nami#qsk_nv	66,{
+	if ((BaseClass == Job_Novice && JobLevel > 3) || (BaseLevel > 11 && NOV_SK < 3)) {
+		mes "[Nami]";
+		mes "Hello!";
+		mes "I want to be a nurse so bad!";
+		mes "I always go and try to learn more.";
+		mes "Actually, I'm really good.";
+		mes "Do you want me to try on you? ? ? . .";
 		next;
-		mes "....... 1 hour later.......";
-		next;
-		skill 142,1,0;
-		set FIRSTAID,0;
-		set got_bandage,0;
-		mes "[Nurse Aid]";
-		mes "YES! You finally got it.  Now you can heal yourself and continue fighting those bad monsters.  Well, take care.";
-		emotion e_no1;
-		close;
+		if (select("Continue conversation:Slowly slink away. . . .") == 1) {
+			if (NOV_SK >= 0 && NOV_SK <= 2) {
+				switch(NOV_SK) {
+				case 0:
+					mes "[Nami]";
+					mes "Thank you for giving me this chance!";
+					mes "I will do the best I can.";
+					mes "When I am nursing people, I never";
+					mes "give half effort. -";
+					next;
+					mes "[Nami]";
+					mes "Let me explain to you about";
+					mes "this skill I am using, ^3355FF' First Aid '^000000 ";
+					mes "It doesn't take any special";
+					mes "equipment or items . .";
+					mes "Using only old cloth, left over potions,";
+					mes "and some other unsubstantial materials";
+					next;
+					mes "[Nami]";
+					mes "you can perform first aid. -";
+					mes "It is a simple skill that you can use";
+					mes "to regain a small amount of HP.";
+					mes "I wouldn't mind teaching you. . .";
+					mes "If you want to learn this skill,";
+					mes "it does not take much to learn. . .";
+					next;
+					mes "[Nami]";
+					mes "First aid does require";
+					mes "some small preparations. . .";
+					mes "Some simple items you should have on hand are";
+					mes "^3355FF' 3 Red Herb '^000000 ";
+					mes "^3355FF' 3 Clover '^000000 ";
+					mes "^3355FF' 1 Sterilized Bandages '^000000 ";
+					next;
+					mes "[Nami]";
+					mes "You can find these items being";
+					mes "carried by monsters close by or";
+					mes "even buy them from a merchant.";
+					mes "It shouldn't be difficult to prepare";
+					mes "these items for your first aid skill.";
+					next;
+					mes "[Nami]";
+					mes "The only item you must take";
+					mes "a special trip for is the bandage.";
+					mes "On the eastern side second floor ";
+					mes "of the prontera castle you can find";
+					mes "a nurse who will supply you with this";
+					mes "item readily. You should see her for this item";
+					next;
+					mes "[Nami]";
+					mes "If you go and find these items, ";
+					mes "I will be happy to teach you this skill.";
+					mes "Well, I will be awaiting your return.";
+					set NOV_SK,1;
+					close;
+				case 1:
+					mes "[Nami]";
+					mes "First aid does require";
+					mes "some small preparations. . .";
+					mes "Some simple items you should have on hand are";
+					mes "^3355FF' 3 Red Herb '^000000 ";
+					mes "^3355FF' 3 Clover '^000000 ";
+					mes "^3355FF' 1 Sterilized Bandages '^000000 ";
+					next;
+					mes "[Nami]";
+					mes "You can find these items being";
+					mes "carried by monsters close by or";
+					mes "even buy them from a merchant.";
+					mes "It shouldn't be difficult to prepare";
+					mes "these items for your first aid skill.";
+					next;
+					mes "[Nami]";
+					mes "The only item you must take";
+					mes "a special trip for is the bandage.";
+					mes "Two maps east of here you can find";
+					mes "a nurse who will supply you with this";
+					mes "item readily. You should see her for";
+					mes "this item. . . ";
+					close;
+				case 2:
+					if (countitem(507) > 2 && countitem(705) > 2) {
+						delitem 507,3; //Red_Herb
+						delitem 705,3; //Clover
+						mes "[Nami]";
+						mes "Hello, welcome back!";
+						mes "You have done well at finding";
+						mes "the necessary items.";
+						mes "I know that the Nurse is a little";
+						mes "strange, I am sure it was a little perplexing. . .";
+						mes "hee hee hee . . . . .";
+						next;
+						mes "[Nami]";
+						mes "Well, let us begin our training.";
+						mes "When using the first aid skill";
+						mes "you will use about 3 SP and convert";
+						mes "this energy into about 5 HP.";
+						mes "This is done with your first aid skill";
+						mes "and supplies.";
+						next;
+						mes "[Nami]";
+						mes "You should take this and place it here. . .";
+						mes "Then you can stop the bleeding. . .";
+						mes "After that you should apply this. . .";
+						mes "There!!! Isn't it easy? ! ? !";
+						next;
+						mes "[Nami]";
+						mes ". . Basically.";
+						mes "You can take a little of left";
+						mes "herbs and common items";
+						mes "and combine them together and. . .";
+						mes "Presto !!";
+						next;
+						skill 142,1,0;
+						set NOV_SK,3;
+						mes "[Nami]";
+						mes "Yes yes, that¡¯s right!";
+						mes "Now that you have this";
+						mes "skill, I hope that it helps you";
+						mes "in the future.";
+						mes "Thank you and have a great day !~~~";
+						close;
+					}
+					else {
+						mes "[Nami]";
+						mes "First aid does require";
+						mes "some small preparations. . .";
+						mes "Some simple items you should have on hand are";
+						mes "^3355FF' 3 Red_Herb '^000000 ";
+						mes "^3355FF' 3 Clover '^000000 ";
+						mes "^3355FF' 1 Sterilized Bandages '^000000 ";
+						close;
+					}
+				}
+			}
+			else {
+				mes "[Nami]";
+				mes ". . . . . Z z z";
+				mes "I am so sorry!!!...I know I did it wrong...!!";
+				mes "Wahhhh ..";
+				mes "!! *sigh* !!";
+				mes "- *rolls her eyes* -";
+				close;
+			}
+		}
+		else {
+			mes "[Nami]";
+			mes "Hey! .. Where are you going? !";
+			mes "Come over here and have a shot !";
+			mes "Prick and its over !!";
+			mes "Grab that patient! ! !";
+			close;
+		}
 	}
-	if(getskilllv(142)>0){
-		mes "Well hello again.  I really hope the First Aid skill has been helpful to you.  Make sure to continue your hard work and don't forget to rest and heal!";
+	else {
+		mes "[Nami]";
+		mes "I am working hard to receive";
+		mes "my nursing license . . .";
+		mes "I don't think that I lack anything";
+		mes "to become a nurse . .";
+		mes "It must be because of my lack of my experience ?";
+		next;
+		mes "[Nami]";
+		mes "If only you had at least";
+		mes "a first job . .";
+		mes "or maybe be over ^3355FF novice job level 4^000000";
+		mes "I could have talked to";
+		mes "you a little longer. . . . . . .";
 		close;
 	}
-	mes "Oh hello there!  You look tired and a little worn out.  Have the monsters outside of town been giving you trouble?";
-	next;
-	menu "Ha! Me strong like BULL!!",-, "Well..um..kinda..",M_Yep;
-
-		mes "[Nurse Aid]";
-		mes "Oh I see.  You must be a mighty warrior.  Well, come back anytime if you do ever feel overwhelmed by the monsters.  I'll be able to help.";
-		close;
-	M_Yep:
-		mes "[Nurse Aid]";
-		mes "Well don't feel bad.  It can be very difficult fighting those nasty monsters in the beginning.";
-		next;
-		mes "[Nurse Aid]";
-		mes "I know because I've been treating a lot people lately who have been fighting them.";
-		mes "There are so many injured now that I don't think I can continue treating anyone.";
-		next;
-		mes "[Nurse Aid]";
-		mes "~Sigh~";
-		next;
-		mes "[Nurse Aid]";
-		mes "That's why I've decided to teach people how to heal themselves!  Would you like me to teach you?";
-		emotion e_ic;
-		next;
-		menu "Would you??",sM_Yes, "(...she's nuts!...run!!!)",-;
-
-			mes "[Nurse Aid]";
-			mes "Hey!...Where are you running too??...";
-			emotion e_swt;
-			close;
-		sM_Yes:
-			mes "[Nurse Aid]";
-			mes "In order for me to teach you First Aid you need to have at least a^0000ff Job Level of 3^000000.";
-			mes "You then need to give me:^ff0000 5 Red Herbs^000000,^00bb00 5 Clovers^000000, and an^aaaa00 Old Bandage^000000.";
-			next;
-			mes "[Nurse Aid]";
-			mes "You can get the bandage from the^0000ff 'Newbie Assistant'^000000 located on the second floor of the Castle.";
-			next;
-			mes "[Nurse Aid]";
-			mes "Once you get Job Level 3 and have all of the items come back and see me, OK?";
-			set FIRSTAID,1;
-			close;				
 }
 
-
-//<-------------------------------------------------------------------------------------------------- Bulma: Play Dead -------------------------------------------------------------------------------------------->\\
-prt_in,73,87,2	script	Bulma	98,{
-	mes "[Bulma]";
-	if(BaseJob != Job_Novice){
-		mes "Yeah... I look great.... After all, I'm a Knight of the Prontera Chivalry.  Kuhahahaha!";
-		emotion e_heh;
-		next;
+prt_in,73,87,4	script	Chivalry Member#qsk_nv	65,{
+	if ((BaseJob == Job_Novice && Upper != 1 && JobLevel > 6) && NOV_SK >= 3 && NOV_SK <= 5) {
 		mes "[Bulma]";
-		mes "It hasn't been that long since I became a Knight, but I still look good as one right? What do you think???";
-		emotion e_hmm;
-		close;
-	}
-	if(JobLevel < 7){
-		mes "Hello my young friend.  You remind me of myself when I was young.....";
-		mes "Heh heh, I really miss those days..... Wow... It's funny to think about those years now......";
+		mes "Yeah. . . I look great. . .";
+		mes "I am a knight in the knight's";
+		mes "guild of Prontera! Kuhahhahhahah !!";
+		mes "It hasn't been long since I became a";
+		mes " knight, but I still look great huh?";
+		mes "What do you think? ? ?";
 		next;
-		mes "[Bulma]";
-		mes "They were difficult.... thankfully you can use the ^5555FFPlay Dead^000000 skill when you reach a ^5555FFJob Level of 7^000000.";
-		mes "If you're interested in it come back and talk to me when you've leveled up a bit more.";
-		close;
-	}
-	if(PLAYDEAD){
-		if(countitem(7039)<1){
-			mes "HEY! What are you doing here?  It's irresponsible of you to still be here while your time is running out.........";
-			emotion e_gasp;
+		switch(NOV_SK) {
+		case 3:
+			mes "[Bulma]";
+			mes "Hello my young friend -";
+			mes "You remind me of myself as young";
+			mes "sword man. . . ";
+			mes "Kekekkek, Oh I miss those days . .";
+			mes "Look at me acting like an old man.";
+			mes "Heh heh Sorry...";
+			next;
+			mes "[Bulma]";
+			mes "I'm still young!!! Aren't I???";
+			mes "If you just work hard and be patient,";
+			mes "you will soon receive the job you desire as well.";
+			mes "It takes patience, but this is";
+			mes "good life kekkeke";
+			mes "Hmm, I would like to help you out . .";
+			next;
+			mes "[Bulma]";
+			mes ". . . . . I'm not sure why you are looking";
+			mes "at me like that. I assure you that this";
+			mes "might seem a little weird at first, but";
+			mes "what I tell you will most likely be a great aid to you..";
+			next;
+			mes "[Bulma]";
+			mes "Ha ha... It looks like you are getting";
+			mes "a bit interested in what I have to say.";
+			mes "I can teach you a very useful skill!";
+			mes "This skill is acting like you are dead! '";
+			mes "No No, it is more than acting, you ";
+			mes "actually look dead!!! ..";
+			next;
+			mes "[Bulma]";
+			mes "The name of the skill is ^3355FF' Play Dead '^000000";
+			mes "It is a skill I used as a novice.";
+			mes "But don't think little of it because";
+			mes "it is a novice skill. In fact, it takes";
+			mes "extreme concentration and skill";
+			mes "to even make this skill pass as believable.";
+			next;
+			mes "[Bulma]";
+			mes "For example,";
+			mes "What if you are attacked by a strong";
+			mes "monster and can't survive.";
+			mes "You must play dead!";
+			mes "But if the monster was to tickle you,";
+			mes "could you control yourself?";
+			next;
+			mes "[Bulma]";
+			mes "The skill will help you deal with";
+			mes "many situations such as this.";
+			mes "It is truly a skill for the strong minded.";
+			mes "The goal of the skill is to look";
+			mes "perfectly dead. . .";
+			next;
+			mes "[Bulma]";
+			mes "I think that¡¯s enough explanation.";
+			mes "I can tell by the look in your eyes";
+			mes "that you are ready for your training.";
+			mes "Lets not delay!";
+			mes "Ok, take this pill first. . .";
+			mes "Let¡¯s see how this goes. . .";
+			next;
+			mes "[Bulma]";
+			mes "Within in 10 minutes, you must";
+			mes "go to the 2nd floor of the Prontera Castle's";
+			mes "East wing. ^3355FF' Newbie Tag '^000000 is";
+			mes "the item you are seeking. ! . .";
+			next;
+			mes "^3355FF- *Gulp* (You have swallowed the pill) -^000000";
+			next;
+			mes "[Bulma]";
+			mes "The pill that you have just taken";
+			mes "will make it difficult for you to breathe. . .";
+			mes "Kekekk . .AH HA - Just joking !";
+			mes "It is actually a pill to gives you";
+			mes "a mental calm so you can be patient.";
+			mes "I think that nothing is better";
+			next;
+			mes "[Bulma]";
+			mes "training than running.";
+			mes "Okay? GO! ! ! ! ~~~~~";
+			mes "If you are late, you have to do it again! !";
+			mes "Now GO ! GO ! GO !";
+			mes "Run ~~~~~!!!!";
+			set NOV_SK,4;
+			close;
+		case 4:
+			mes "[Bulma]";
+			mes "HEY! what are you doing here ? !";
+			mes "You must be very irresponsible to be";
+			mes "here when your time is running out.";
+			mes "Run Run Run! - - - - -";
 			next;
 			mes "[Bulma]";
-			mes "Now GO! Run! Run! RUN!!";
-			emotion e_go;
+			mes "On the 2nd floor of the east wing!";
+			mes "It's in the Prontera castle!";
+			mes "Okayyyyy~~~!! *waves goodbye*";
 			close;
+		case 5:
+			if (countitem(7039) > 0) {
+				mes "[Bulma]";
+				mes "Hey... I see that you have -";
+				mes "finished your quest! ! ! . .";
+				mes "If you can endure all this,";
+				mes "it shouldn't be a problem to use";
+				mes "this skill. You are a natural!";
+				next;
+				mes "[Bulma]";
+				mes "Now, if you ever feel threatened,";
+				mes "use this skill as you see fit.";
+				mes " ' Play Dead ' ";
+				mes "Okay okay, See you around ! ! !";
+				set NOV_SK,6;
+				delitem 7039,1; //Novice_Nametag
+				skill 143,1,0;
+				close;
+			}
+			else {
+				mes "[Bulma]";
+				mes "What? -";
+				mes "Why haven't you finished your quest?";
+				mes " *Tsk* *Tsk* You must have lost the pass . . .";
+				mes "Such irresponsibility is not acceptable.";
+				mes "I can't accept you into training until";
+				mes "I know you are capable. Go and try again.";
+				next;
+				mes "[Bulma]";
+				mes "Don't take me lightly. . .";
+				mes "If I tell you to come in 10 minutes,";
+				mes "I expect that of you.";
+				mes "In order for you to have another chance,";
+				mes "you must start from the beginning. . .";
+				mes "Do it right this time ! ! ! !";
+				set NOV_SK,4;
+				close;
+			}
 		}
-		delitem 7039, 1;
-		mes "Good to see you again.  Alright, lets start your training....";
-		next;
-		mes "[Bulma]";
-		mes "Let me first introduce to you the concept of 'Method Acting'.  Method Acting stresses the need to understand every aspect of the role you are playing.";
-		next;
-		mes "[Bulma]";
-		mes "You must learn to think, feel, and even live like your character so that you can understand his/her motivation in any given moment.";
-		next;
-		mes "[Bulma]";
-		mes "Now let us use this technique to develop your ability to Play Dead!";
-		mes "I want you to think like a dead person, feel like a dead person, eat, breath, sleep, kiss, etc. like a person who is dead!!!";
-		next;
-		mes "[Bulma]";
-		mes "Don't just stand there! Lay down on the ground and live life through the eyes of a dead person.... errr or don't live.... anyways just do it!!";
-		next;
-		mes "~ several hours later ~";
-		next;
+	}
+	else {
 		mes "[Bulma]";
-		mes "OK, lights, camera, ACTION! Yes... yes... YES!! That's it!! As I watch you laying there I TRULY believe that you are dead.";
-		mes "What a wonderful performance! BRAVO! BRAVO!";
-		emotion e_gasp;
+		mes "Yeah... I remember back to long ago !";
+		mes "Especially those embarrassing Novice years.";
+		mes "Wow... It is funny to think about those years now.";
+		mes "Those years were difficult. . .";
+		mes "Thankfully you can use the First Aid";
+		mes "skill when you reach novice job level 7.";
 		next;
 		mes "[Bulma]";
-		mes "With the right motivation and focus you will be able to play dead anywhere at any given moment.  Congratulations on mastering this skill.";
-		emotion e_no1;
-		skill 143,1,0;
-		set PLAYDEAD, 0;
-		set got_novnametag,0;
-		close;
-	}
-	if(getskilllv(143)>0){
-		mes "Yeah.... I remember back then..... especially those embarrassing novice years... heh.  Luckily there was Play Dead.";
-		mes "That saved me many times in the past.  I'm sure it has been saving you too.";
+		mes "That saved me many times in the past. . .";
+		mes "I am sure it will help you much as well.";
+		mes "Hopefully, it will be something you use well . .";
 		next;
 		mes "[Bulma]";
-		mes "Hopefully it is something you have been using well.  If you have any friends who are novices, tell them about me.  I will help them out as good as I can.";
+		mes "If you have any friends who are novices,";
+		mes "tell them about me.";
+		mes "If I can, I will help them out";
+		mes "as best as I can . . . .";
 		close;
 	}
-	mes "Hello my young friend.  You remind me of myself when I was young..... Heh heh, I really miss those days.....";
-	mes "Look at me acting all sentimental like some old man........";
-	next;
-	mes "[Bulma]";
-	mes "Sorry about that.  Anyhow, I just want you to know that if you work hard and are patient, you too will receive the job you desire.";
-	mes "It may take some time but stay focused and never loose your determination.";
-	next;
-	mes "[Bulma]";
-	mes "Hmm..... actually I might be able to help you out........";
-	emotion e_hmm;
-	next;
-	mes "[Bulma]";
-	mes "What's this? Ha ha, don't look so surprised.  What I have to offer will be very useful to you.";
-	next;
-	mes "[Bulma]";
-	mes "You see I can teach you the skill ^5555FF'Play Dead'^000000.";
-	mes "This skill allows you to act like you just died making any monster that is currently attacking you leave you alone.";
-	next;
-	mes "[Bulma]";
-	mes "I myself have used it as a novice and found it to be very useful.";
-	mes "It may sound easy enough, but it takes a lot of hard work and practice to make your performance look believable.";
-	next;
-	mes "[Bulma]";
-	mes "You MUST look perfectly DEAD in order for this skill to work.  Even the slightest movement will give you away.";
-	next;
-	mes "[Bulma]";
-	mes "I think I've done enough explaining..... The look in your eyes tells me that you are ready to learn this skill.";
-	next;
-	mes "[Bulma]";
-	mes "First take this pill....";
-	next;
-	mes "(you take the pill) ~gulp~";
-	next;
-	mes "[Bulma]";
-	mes "Good.  Now go to the 2nd floor on the East side of the Prontera Castle.";
-	mes "Speak with the ^5555FFNewbie Assistant^000000 and he will give you a ^5555FFNewbie Tag^000000.";
-	next;
-	mes "[Bulma]";
-	mes "Once you have the tag come back here.  You MUST make it back here WITHIN ^FF555510 minutes^000000!";
-	mes "If you don't, then the pill you just swallowed will start making it hard for you to breath!.....";
-	next;
-	mes "[Bulma]";
-	mes "Kekekeke..... Just kidding!  The pill actually helps you stay calm, nothing more.";
-	emotion e_heh;
-	next;
-	mes "[Bulma]";
-	mes "Well get going... GO! GO! GO! RUN!!!";
-	emotion e_go;
-	set PLAYDEAD, 1;
-	close;
 }
 
-
-//Newbie Assistant------------------------------------------------------------------------------
-prt_castle,174,147,2	script	Newbie Assistant	84,{
-	mes "[Newbie Assistant]";
-	if(BaseJob != Job_Novice){
-		mes "What am I doing here?  I'm just trying to help out young newbies.  You remember how it was to be a newbie... confused.... lost.... heh heh.";
-		emotion e_what;
-		close;
-	}
-	if(FIRSTAID && countitem(930)==0 && !got_bandage){
-		mes "So Nurse Aid sent you huh.  She's a great nurse, you should feel very fortunate that she is helping you out.  Here take this.";
-		next;
-		getitem 930,1;
-		set got_bandage,1;
-		mes "[Newbie Assistant]";
-		mes "You'll need it in order for her to teach you her excellent healing technique.";
-		next;
-		mes "[Newbie Assistant]";
-		mes "When I watch her work it is like watching an angel that has descended down from the heavens.....";
-		next;
-		mes "[Newbie Assistant]";
-		mes "Her beauty, her grace, sometimes I wish........ (blushes).......... um.... well... err... tell her I said hello.";
-		emotion e_lv;
-		close;
+prt_castle,175,146,4	script	Nursing Instructor#qsk_nv	50,{
+	mes "[Dread Lord]";
+	mes ". . . . . . . . . .";
+	mes ". . . . . . . . . .";
+	mes "Stop pestering me! ! !";
+	mes "I am very busy ! ! !";
+	mes "Would you just bug off ? ! ? !";
+	next;
+	if (NOV_SK >= 0 || NOV_SK <= 5) {
+		switch(NOV_SK) {
+		case 0:
+			mes "[Dread Lord]";
+			mes "The people who work here at";
+			mes "Prontera clinic are battling life";
+			mes "and death everyday.";
+			mes "It takes a lot of patience and ";
+			mes "puts a lot of tension on us.";
+			mes "Sorry if we seem a bit uptight. . .";
+			next;
+			mes "[Dread Lord]";
+			mes "I am the Nursing director.";
+			mes "There are many things I must do.";
+			mes "If your business is complete, please leave.";
+			close;
+		case 1:
+			mes "[Dread Lord]";
+			mes "Ohhh . .";
+			mes "You have come here for bandages ?";
+			mes "Do you even know how we get these";
+			mes "precious bandages ?";
+			mes "They come from a powerful monster";
+			mes "that is found in the pyramids of Moroc.";
+			next;
+			mes "[Dread Lord]";
+			mes "The monster is some sort of mummy.";
+			mes "We take the rotten bandages from it's";
+			mes "diseased body and sanitize them. . .";
+			mes "Do you believe me ? . .";
+			mes "Heh heh... There is even poison";
+			mes "in the bandages.";
+			next;
+			mes "[Dread Lord]";
+			mes "Fortunately, the poison kills other poisons";
+			mes "and does not hurt the patient . .";
+			mes "You must destroy poison with poison. . .";
+			mes "I think I heard something similar that. . .";
+			mes ". . . . . Anyway, I would usually give you a";
+			mes "hard time for taking these bandages lightly,";
+			next;
+			mes "[Dread Lord]";
+			mes "but I am much too tired today to";
+			mes "give you any trouble. . .";
+			mes "If you ever get skilled in medicine and first aid,";
+			mes "please consider joining our clinic.";
+			mes "Now don't take these bandages and then";
+			mes "go and get killed, be careful. -";
+			next;
+			mes "^3355FF- Got 1 Sterilized Bandages -^000000";
+			set NOV_SK,2;
+			close;
+		case 2:
+			mes "[Dread Lord]";
+			mes "Look, if your business is done";
+			mes "get out of my site! ! !";
+			mes "I have no time for this nonsense ..";
+			mes ". . . . .";
+			mes "- Click Click *Walks away* . . . . . -";
+			close;
+		case 4:
+			if (countitem(7039) == 0) {
+				mes "[Dread Lord]";
+				mes "Look at this guy!";
+				mes "Wake up and watch where you are going.";
+				mes "What are you thinking running around our clinic!";
+				mes "Running ?!?!";
+				mes "*Sigh* . . ";
+				mes "What do you want? ! ? !";
+				next;
+				mes "[Dread Lord]";
+				mes "I see. . . .";
+				mes ". . . . . what ?";
+				mes "You want to have a bandage to learn first aid?";
+				mes " *Arhg* Here take it !";
+				mes "-woosh - *storms away*";
+				next;
+				mes "^3355FF- Got 1 Newbie Tag -^000000";
+				set NOV_SK,5;
+				getitem 7039,1; //Novice_Nametag
+				close;
+			}
+			else {
+				mes "[Dread Lord]";
+				mes "What ! !";
+				mes "I'm only going to give you one!";
+				mes "You don't need any more for the test !";
+				mes "Do you want to stay a novice forever???";
+				mes "I would be happy to arrange that !";
+				close;
+			}
+			break;
+		case 5:
+			mes "[Dread Lord]";
+			mes "What more do you want !";
+			mes "Get out of here !";
+			mes "OUT !";
+			close;
+		}
 	}
-	if(PLAYDEAD && countitem(7039)==0 && !got_novnametag){
-		mes "So Bulma sent you uh.... okay here you go.";
-		getitem 7039,1;
-		set got_novnametag,1;
-		next;
-		mes "Good luck on your adventure.";
+	else {
+		mes "[Dread Lord]";
+		mes "Argh, Get out of here !!";
+		mes "I don't like shouting but ..";
+		mes "GET OUT OF HERE! ! ! ! ! !";
 		close;
 	}
-	mes "Hello.  I'm here to provide help to newbies like you.  If there is anything in particular that you need assistance with just let me know.";
-	close;
 }
diff --git a/npc/quests/skills/swordman_skills.txt b/npc/quests/skills/swordman_skills.txt
index cd2dfafeb..8d1386ee6 100644
--- a/npc/quests/skills/swordman_skills.txt
+++ b/npc/quests/skills/swordman_skills.txt
@@ -1,374 +1,469 @@
-//===== eAthena Script =======================================
-//= Swordsman Skills Quests
-//===== By: ==================================================
-//= kobra_k88
-//===== Current Version: =====================================
-//= 1.5a
-//===== Compatible With: =====================================
-//= eAthena 7.15 +
-//===== Description: =========================================
-//= <Description> 
-//===== Additional Comments: =================================
-//= Fully working
-//= 1.0a Now using functions found in "Global_Functions.txt"
-//= for class checks.
-//= 1.1 Added missing delitem [Lupus]
-//= 1.2 Added Baby Class Support [Lupus]
-//= 1.3 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
-//= 1.4 Updated the NPC to allow subclasses of swordsman to learn the skills, [MasterOfMuppets]
-//=	1.5 Fixed exploits [Lupus]
-//= 1.5a Fixed some typos [IVBela]
-//============================================================
-
-
-
-//<-------------------------------------- Fatal Blow------------------------------------>\\
-prt_in,75,88,5	script	Leon	85,{
-	mes "[Leon]";
-	if((BaseClass == Job_Swordman && JobLevel >=25) || BaseJob == Job_Knight || BaseJob == Job_Crusader) goto L_Start;
-	if(BaseJob == Job_Novice) goto L_Novice;
-
-	mes "Hello there.  I am Leon, a well known and well respected member of the famous Prontera Chivalry.";
-	next;
-	mes "[Leon]";
-	mes "Are you here to learn more about the Chivalry, or are you hear to bask in the glory of us Knights? Hahahaha!";
-	emotion e_heh;
-	close;
-
-L_Novice:
-	mes "Oh a novice.... I'm afraid I have nothing to offer you.";
-	mes "I have no fun or nice things to say to anyone other then Swordsmen.";
-	next;
-	mes "[Leon]";
-	mes "See you in a better world!";
-	close;
-
-L_Start:
-	if (FATALBLOW == 1) goto L_Check;
-	if (getskilllv(145)>0) goto L_Done;
-
-	if(sex==1)mes "Oooh! I see that you are quite a strong Swordsman.";
-	if(sex==0)mes "Oooh! I see that you are quite a strong Swordswoman.";
-	mes "How did I know? Hahaha! Just look at that strong arm of yours!";
-	next;
-	mes "[Leon]";
-	mes "You must enjoy using ^0000ff'Bash'^000000, huh? Hahaha!";
-	emotion e_heh;
-	next;
-	mes "[Leon]";
-	if(sex==1)mes "I like a Swordsman who isn't afraid to use a powerful skill such as that.";
-	if(sex==0)mes "Now, now, don't be shy.  It's OK for girls to like Bash.";
-	if(sex==0)mes "After all, whether your a Swordsman or Swordswoman, there's no denying the power of Bash!";
-	next;
-	mes "[Leon]";
-	mes "As great as Bash is though, I often felt that it could be even better if there was some way to stun an opponent with it.";
-	mes "I decided to withdraw from the battlefield and research ways of making bash more powerful.";
-	next;
-	mes "[Leon]";
-	mes "I discovered that if one could strike an enemy's weak point with a precisely placed Bash, an opponent would be left utterly paralyzed!!";
-	next;
-	mes "[Leon]";
-	mes "I then went on to develop the skill, ^ff0000'Fatal Blow'^000000, which allows you to do just that!";
-	mes "With rigorous training, one can learn to stun an opponent with a mighty Bash.";
-	next;
-	mes "[Leon]";
-	mes "Since you seem to be so fond of Bash, I'd be willing to teach you the skill.";
-	mes "However, I must warn you that a lot of hard work will be required.";
-	next;
-	mes "[Leon]";
-	mes "So what do you think? Are you interested?";
-	next;
-	menu "You betcha!!",M_0, "Nah.... Not really.",M_1, "Any advice on how to eat sushi?",M_2;
-
-	M_0:
-		set FATALBLOW,1;
-		mes "[Leon]";
-		mes "Hahaha! I knew you love Bash as much as I do.";
-		next;
-		mes "[Leon]";
-		mes "In order for me to teach you Fatal Blow, you must have at least ^5555FFlevel 5 Bash^000000.  You then need to give me these items:";
-		mes "- 10 ^FF0000Fire Arrows^000000,";
-		mes "- 10 ^FF0000Silver Arrows^000000,";
-		mes "- 1 ^FF0000Banana Juice^000000,";
-		mes "- 30 ^FF0000Tentacles^000000,";
-		mes "- and 5 ^FF0000Royal Jelly^000000.";
-		next;
-		mes "[Leon]";
-		mes "When you have gathered all of these items come back and see me.";
+izlude_in,175,130,2	script	Knight De Thomas#qsk_sm	98,{
+	if (BaseClass == Job_Swordman) {
+		if (SWORD_SK < 1 && getskilllv(144) == 0) {
+			mes "[De Thomas]";
+			mes "Oh, no! You must have been hurt! Are you ok?";
+			mes "You must have fought hard to get such serious injuries..";
+			mes "Being a swordsman must come with a lot of responsibility and sacrifice.";
+			next;
+			mes "[De Thomas]";
+			if (Sex == 0)
+				mes "For these swordsmen and knights, there is a wonderful skill.";
+			else
+				mes "For these swordswomen and knights, there is a wonderful skill young lady.";
+			mes "I present to you - HP Recovery While Moving!";
+			mes "Body moving is a splendid skill";
+			mes "that allows you to regain strength(HP)";
+			mes "while you are moving!";
+			next;
+			mes "[De Thomas]";
+			mes "It is currently under development";
+			mes "so it may not recover that much,";
+			mes "but it will help a little.";
+			mes "What do you think? Would you like to learn this skill?";
+			next;
+			if (select("What a nice skill! I want to learn it!:No, thank you.") == 1) {
+				mes "[De Thomas]";
+				mes "Very well. I will tell you what you need to learn this skill.";
+				mes "First, your job level must be higher than ^00880035^000000.";
+				mes "You will also need ^008800200 empty bottles^000000.";
+				mes "Why? Because it is proof that you fought fiercely to have used that many potions.";
+				next;
+				mes "[De Thomas]";
+				mes "Also, the armor you used in battle.";
+				mes "This is also proof of an experienced fighter.";
+				mes "For the armor... your armor is perfect!";
+				mes "Bring your armor!";
+				mes "Last but not least... bring me one ^008800Moth Wing^000000.";
+				next;
+				select("Eh? You need that, too?");
+				mes "[De Thomas]";
+				mes "Not really.. I don't really NEED it.";
+				mes "It's just that my niece has gotten a bug hunting as a holiday task during the summer vacation.";
+				mes "Of course! It would be much easier for me to get it myself.";
+				mes "but I must work here all the time so I don't exactly have the time to go out and get it.";
+				next;
+				mes "[De Thomas]";
+				mes "Don't you think it is pitiful that I have to stay in once place everyday, not being able to go outside?";
+				mes "Please, find me one...*sniffsniff*";
+				mes "If you don't...";
+				set SWORD_SK,1;
+				mes "You won't get anything! Muahahaha.";
+				close;
+			}
+			mes "[De Thomas]";
+			mes "...";
+			close;
+		}
+		else if (SWORD_SK == 1 && getskilllv(144) == 0) {
+			mes "[De Thomas]";
+			mes "Welcome back...";
+			mes "are you ready to learn Body Movin'?";
+			next;
+			switch(select("Yes.:No, I'm not ready yet.")) {
+			case 1:
+				if (JobLevel > 34 && countitem(713) > 199 && countitem(1058) > 0) {
+					mes "[De Thomas]";
+					mes "Let's see.....";
+					next;
+					mes "[De Thomas]";
+					mes "Ok! I shall now teach you...";
+					mes "..The Body Movin' skill!";
+					next;
+					delitem 713,200; //Empty_Bottle
+					delitem 1058,1; //Wing_Of_Moth
+					skill 144,1,0;
+					set SWORD_SK,0;
+					mes "[De Thomas]";
+					mes "There you go!";
+					mes "Try it yourself.";
+					mes "But don't overdo it.";
+					next;
+					mes "[De Thomas]";
+					mes "Oh yeah, I won't be needing your";
+					mes "armor so you can keep it.";
+					mes "..Good luck now!";
+					close;
+				}
+				else if (JobLevel < 35) {
+					mes "[De Thomas]";
+					mes "Wait a second your Job level isn't above ^00880035^000000!";
+					mes "Come back when it is.";
+					close;
+				}
+				else if (countitem(713) < 200 || countitem(1058) < 1) {
+					mes "[De Thomas]";
+					mes "You do not have all the items I asked for.";
+					next;
+					mes "[De Thomas]";
+					mes "Remember I need, ^008800200 empty bottles^000000, your armor, and a ^008800Moth Wing^000000. Come back when you have it all.";
+					close;
+				}
+				else {
+					mes "[De Thomas]";
+					mes "You do not have all the items I asked for.";
+					next;
+					mes "[De Thomas]";
+					mes "Remember I need, ^008800200 empty bottles^000000, your armor, and a ^008800Moth Wing^000000. Come back when you have it all.";
+					close;
+				}
+			case 2:
+				mes "[De Thomas]";
+				mes "Is that so?";
+				mes "Then come when you are prepared.";
+				close;
+			}
+		}
+		else {
+			mes "[De Thomas]";
+			mes "Oh, it's you?";
+			mes "Long time no see!";
+			mes "You seem healthier than before.";
+			mes "Hahahaha!";
+			mes "Take care! See you again!";
+			close;
+		}
+	}
+	else {
+		mes "[De Thomas]";
+		mes "My name is De Thomas Carlos.";
+		mes "Knight of Prontera's 3rd Calvary.";
+		mes "I have a certain duty these days.";
+		mes "Ehem! Need I say more.";
 		close;
-	M_1:
-		mes "[Leon]";
-		mes "I see... I must have misjudged you...";
-		close;
-	M_2:
-		mes "[*Sushi King* Leon]";
-		mes "The best way to eat sushi is with your hands.  That is the basic method.  Oh, and dip the FISH, NOT the RICE, into the soy sauce.";
-		next;
-		mes "[*Sushi King* Leon]";
-		mes "That way you get a richer flavor.  Also, always eat the kind that is in season.";
-		mes "Eating in the order of white fish, then blue fish, will make it taste even better!";
-		next;
-		mes "[*Sushi King* Leon]";
-		mes "Mmmmm..... I love sushi!!!";
-		emotion e_ok;
-		close;
-
-L_Check:
-	mes "So you're back.  Did you get what I asked for?";
-	next;
-	mes "[Leon]";
-	if(countitem(1752)<10 || countitem(1751)<10 || countitem(532)<1 || countitem(962)<30 || countitem(526)<5) goto L_NoItems;
-	if(getskilllv(5)<5) goto L_BashLvl;
-	delitem 1752,10;
-	delitem 1751,10;
-	delitem 532,1;
-	delitem 962,30;
-	delitem 526,5;
-	mes "Great work.  You have everything I need for me to teach you Fatal Blow.";
-	next;
-	mes "[Leon]";
-	mes "OK, lets get started.";
-	next;
-	mes "!SMACK!~!CRACK!~!THWACK!~!BASH!.......... !SMACK!~!CRACK!~!THWACK!~!BASH!..........";
-	next;
-	mes "(5 hours later)";
-	next;
-	mes "[Leon]";
-	mes "Yes! That's it! You have just mastered Fatal Blow!";
-	emotion e_no1;
-	next;
-	skill 145,1,0;
-	set FATALBLOW,0;
-	mes "[Leon]";
-	mes "Use it wisely young warrior!!";
-	close;
-
-	L_NoItems:
-		mes "Hmm... you still don't have enough items.  Come back when you do.";
-		close;
-	L_BashLvl:
-		mes "Wait a minute... you have to train a little more before learning this skill.";
-		mes "You need to have at least a ^5555FFlevel 5 Bash^000000.";
-		close;
-
-L_Done:
-	mes "So how is Fatal Blow? Isn't it great!! Hahaha! I knew you'd like it.";
-	next;
-	mes "[Leon]";
-	mes "Go on and Bash the heck out of those monsters! Hahaha.";
-	emotion e_heh;
-	close;
-
+	}
 }
 
-
-//<---------------------------------- Moving HP Recovery ---------------------------------->\\
-izlude_in,175,130,2	script	Knight De Thomas	98,{
-	mes "[Knight De Thomas]";
-	if(BaseClass == Job_Swordman) goto L_Start;
-
-L_Other:
-	mes "I am Thomas De Knight of the Prontera Chivalry.  I am very busy now so please leave me alone.";
-	close;
-
-L_Start:
-	if (MOVHPREC == 1) goto L_Check;
-	if (getskilllv(144)>0) goto L_GotSkill;
-	mes "Oh no! You must have been hurt in battle! Are you OK?";
-	mes "It must have been a hard fought battle for you to receive such serious injuries....";
-	emotion e_swt2;
-	next;
-	mes "[Knight De Thomas]";
-	mes "Being a Swordsman or Knight comes with a lot of responsibility and requires a great deal of self sacrifice.";
-	mes "For Swordsmen and Knights there is a wonderful skill that can aid in the recovery of HP.";
-	next;
-	mes "[Knight De Thomas]";
-	mes "I present to you..... ^5555FF'Moving HP Recovery'^000000!! This skill allows you to recover HP while moving!";
-	next;
-	mes "[Knight De Thomas]";
-	mes "The skill has not been perfected yet so the amount of HP recovered is a little low.  Still, it is helpful.";
-	mes "What do you think? Would you like to learn this skill?";
-	next;
-	menu "What a great skill! I would like to learn it!!",M_0, "No thank you.",M_End;
-
-	M_0:
-		mes "[Knight De Thomas]";
-		mes "Very well.  I will tell you what is needed to learn this skill.  First you must have a job level of 35 or greater.";
-		mes "This however doesn't apply to Knights or Crusaders.  You will also need:";
-		mes "^5555FF200 Empty Bottles^000000,";
-		mes "^5555FF1 Padded Armour^000000,";
-		mes "and ^5555FF1 Moth Wings^000000.";
-		next;
-		mes "[Knight De Thomas]";
-		mes "The bottles are proof that you have fought fiercely and have used many potions.  The Padded Armor is proof of an experienced fighter.";
-		mes "The Moth Wings..... well... really aren't necessary.  It's just that my niece received a bug hunting assignment for summer vacation.......";
-		next;
-		mes "[Knight De Thomas]";
-		mes "I would get them myself... it's just... I must work here all day long so I don't have any time to go out and get them.......";
-		next;
-		mes "[Knight De Thomas]";
-		mes "Don't you think it's sad that I have to stay in once place everyday without even being able to go outside??";
-		mes "Please.... find a pair of Moth Wings for my niece?.... (~sniff~sniff~)....";
-		emotion e_sob;
-		next;
-		mes "[Knight De Thomas]";
-		mes "If you don't..... I won't teach you anything!! Muahahahaha!!";
-		emotion e_gg;
-		set MOVHPREC, 1;
+prt_in,75,88,5	script	Leon Von Frich#qsk_sm	85,3,3,{
+	if ((BaseJob == Job_Swordman && JobLevel >= 25) || BaseJob == Job_Knight || BaseJob == Job_Crusader) {
+		if (getskilllv(145) == 1) {
+			mes "[Leon]";
+			mes "Eh?";
+			mes "I was wondering who that was!";
+			mes "Why it's you from before!";
+			mes "Nice to see you again! How are you?";
+			mes "Be careful! Hahaha!";
+			close;
+		}
+		else if (countitem(1752) > 9 && countitem(1751) > 9 && countitem(532) > 0 && countitem(962) > 29 && countitem(526) > 4) {
+			mes "[Leon]";
+			mes "Ooh! You are more than ready";
+			mes "to learn Fatal Blow!";
+			mes "So how about it? Would you like to learn?";
+			next;
+			switch(select("Yes!:No, I don't want to.:But, what is Fatal Blow?")) {
+			case 1:
+				mes "[Leon]";
+				mes "OK, lets begin!";
+				next;
+				delitem 1752,10; //Fire_Arrow
+				delitem 1751,10; //Silver_Arrow
+				delitem 532,1; //Banana_Juice
+				delitem 962,30; //Tentacle
+				delitem 526,5; //Royal_Jelly
+				skill 145,1,0;
+				mes "[Leon]";
+				mes "Success!";
+				mes "Go use your new skill to its full potential.";
+				mes "Hahahahahahahaha!";
+				close;
+			case 2:
+				mes "[Leon]";
+				mes "I don't like you!!!";
+				close;
+			case 3:
+				mes "[Leon]";
+				mes "I developed this skill recently.";
+				mes "When you use bash, depending ";
+				mes "on your level, you can stun ";
+				mes "your opponent. .";
+				mes "You have learned bash, haven't you?";
+				next;
+				mes "[Leon]";
+				mes "What do you think. Stun is";
+				mes "a very useful technique. Don't you find this skill attractive?";
+				mes "When you think you do, just come right back to me!";
+				close;
+			}
+		}
+		else {
+			mes "[Leon]";
+			mes "Ooh! A young and strong swordsman!";
+			next;
+			mes "[Leon]";
+			mes "Wow, seeing your arm, you must enjoy using bash?";
+			next;
+			select("Eh, I.. just...");
+			mes "[Leon]";
+			if (Sex == 0) {
+				mes "No need to be surprised.";
+				mes "If you use a sword, of course you ought to have a good arm!";
+			}
+			else {
+				mes "Nothing to be embarrassed about.";
+				mes "Even if you are a female you need a strong arm to use a sword!";
+			}
+			mes "In times of only useless and lazy youngsters,";
+			mes "I'm glad I met someone strong like you.";
+			next;
+			mes "[Leon]";
+			mes "Yes, I would like to give a present to an awesome swordsman like you.";
+			next;
+			switch(select("What present?:It's ok.")) {
+			case 1:
+				mes "[Leon]";
+				mes "Haha nothing special, but a skill to attack the vital point!";
+				next;
+				break;
+			case 2:
+				mes "[Leon]";
+				mes "...Haha nothing special, just a skill that aims at the vital spot!";
+				next;
+				break;
+			}
+			mes "[Leon]";
+			mes "It's a skill I developed recently.";
+			mes "When you use bash, depending on";
+			mes "your level, your opponent can";
+			mes "become stunned.";
+			mes "You have learned bash, haven¡¯t you?";
+			next;
+			mes "[Leon]";
+			mes "When I was a swordsman like you,";
+			mes "I used to enjoy using Bash. Every time, I thought";
+			mes "- maybe the attack would be more powerful";
+			mes "if I use stun at the same time.";
+			next;
+			mes "[Leon]";
+			mes "I drew back from the battlefield to do research";
+			mes "and finally, I developed this wonderful new skill!";
+			mes "Would you like to learn this skill?";
+			next;
+			switch(select("Yes.:No.:Do you have any advice on how to eat sushi?")) {
+			case 1:
+				mes "[Leon]";
+				mes "Ok. I'll tell you the requirements.";
+				mes "First you need to have level 5 Bash.";
+				mes "You will also need to prepare 10 Fire Arrows, 10 Silver Arrows, 1 bottle of Banana Juice, 30 Tentacles, and 5 bottles of Royal Jelly.";
+				mes "They are.. somewhat like ingredients.";
+				next;
+				mes "[Leon]";
+				mes "come to me again once you have all the materials.";
+				mes "We shall talk then.";
+				close;
+			case 2:
+				mes "[Leon]";
+				mes "Hahahahahahahahahaha!";
+				mes "... ";
+				mes " ... ";
+				mes " ...";
+				mes "I'm at a loss of words!?";
+				close;
+			case 3:
+				mes "[Sushi King Leon]";
+				mes "The best way to eat sushi is";
+				mes "with your hands.";
+				mes "That is the basic.";
+				mes "And dip the fish, not the rice,";
+				mes "in the soy sauce.";
+				next;
+				mes "[Sushi King Leon]";
+				mes "That way you get a richer flavor.";
+				mes "Also, always eat the kind that is in season.";
+				mes "Eating in the order of white fish then";
+				mes "blue fish will make it taste better!";
+				mes "Mmm! I like sushi~~!";
+				close;
+			}
+		}
 		close;
-	M_End:
-		mes "[Knight De Thomas]";
-		mes "What?? What did you say?.....";
-		emotion e_what;
+	}
+	else {
+		mes "[Leon]";
+		mes "Oh, no! I have nothing to offer you!";
+		mes "I can't say nice and fun things to anyone";
+		mes "other than swordsmen!";
+		mes "See you in a better world!";
 		close;
+	}
 
-L_Check:
-	mes "Ah, you've come back.  Let's, see... are you ready for HP Moving Recovery?....";
-	next;
-	mes "[Knight De Thomas]";
-	if ((countitem(713)<200) || (countitem(1058)<1) || (countitem(2312)<1)) goto L_NoItems;
-	if (JobLevel<35 && BaseJob!=Job_Knight && BaseJob!=Job_Crusader) goto L_LowLvl;
-	delitem 713,200;
-	delitem 1058,1;
-	mes "Great! You have everything needed to learn this skill.  Take a deep breath.... let us begin.";
-	next;
-	mes "(2 hours later)";
-	next;
-	mes "[Knight De Thomas]";
-	mes "Can you feel it? Can you feel the energy flowing in you while you move around?";
-	mes "Haha! You have just learned HP Moving Recovery!";
-//-- Padded armor does not have to be deleted! --
-//	delitem 2312,1;
-	skill 144,1,0;
-	set MOVHPREC, 0;
-	next;
-	mes "[Knight De Thomas]";
-	mes "Congratulations on learning the new skill and thank you for the Moth Wings! ^_^";
-	emotion e_no1;
+OnTouch:
+	mes "[Leon]";
+	mes "Hahahahahahaha!";
+	mes "Hahahahahahaha!";
 	close;
-
-	L_NoItems:
-		mes "As I said before you need to bring me these items:";
-		mes "^5555FF200 Empty Bottles^000000,";
-		mes "^5555FF1 Padded Armour^000000,";
-		mes "and ^5555FF1 Moth Wings^000000.";
-		close;
-	L_LowLvl:
-		mes "You are not yet experienced enough to learn this skill.  Come back when you have a job level of at least 35.";
-		close;
-	L_GotSkill:
-		mes "Ah, you're looking well.  That HP Moving Recovery skill must be very helpful.";
-		mes "Well, continued success on your adventure!";
-		close;
-
 }
 
-
-//<----------------------------------------- Auto-Berserk --------------------------------->\\
-prt_in,94,57,3	script	Juan	85,{
-	mes "[Juan]";
-	if(BaseClass == Job_Swordman) goto L_Start;
-
-L_Other:
-	mes "So how's your adventure going? I hope there will be good days ahead of you.";
-	next;
-	mes "[Juan]";
-	mes "Who am I? Oh, I'm just a kind knight named Juan.  Don't mind me.  Hahahaha....";
-	emotion e_heh;
-	close;
-
-L_Start:
-	if (JobLevel<30 && BaseJob!=Job_Knight && BaseJob!=Job_Crusader) goto L_LowLvl;
-	if (BERSERK == 1) goto L_Check;
-	if (getskilllv(146)>0) goto L_GotSkill;
-
-	mes "Oh no! You have more injuries since the last time I saw you.";
-	mes "You went into battle like this? It seems like you're straining yourself.";
-	next;
-	mes "[Juan]";
-	mes "Even though you may have a lot of strength, there is only so much you can do when you have reached your limits.";
-	mes "So don't overestimate your own power.";
-	next;
-	mes "[Juan]";
-	mes "Of course you could always use the ^5555FF'skill'^000000 we developed to overcome these limits.....";
-	next;
-	menu "Eh! What are you talking about?",M_0, "Haha! There's no such thing....",M_1, "Keuuuuuhhh!",M_3;
-
-	M_0:
-		mes "[Juan]";
-		mes "The skill is called ^5555FFBerserk^000000.  It has been deemed the flower of the battlefield!";
-		mes "When your health is low, you can call upon your hidden potential by provoking yourself.";
-		next;
+prt_in,94,57,3	script	Juan#qsk_sm	85,{
+	if (BaseClass == Job_Swordman) {
+		if (getskilllv(146) == 1) {
+			mes "[Juan]";
+			mes "Mmm? Long time no see!";
+			mes "How are you?";
+			mes "You got stronger than before.";
+			mes "Many expect great things from you.";
+			mes "You can do it.";
+			close;
+		}
+		else if (BaseJob == Job_Swordman && JobLevel < 10) {
+			mes "[?]";
+			mes "What are you?";
+			mes "Eh, still a beginner.";
+			mes "I'm busy, so go train a little more";
+			mes "before coming back.";
+			close;
+		}
+		else if (BaseJob == Job_Swordman && JobLevel > 10 && JobLevel < 30) {
+			mes "[Juan]";
+			mes "Oh, nice to meet you.";
+			mes "You can be on your way. (smiley~)";
+			close;
+		}
+		else if (countitem(924) > 34 && countitem(958) > 9 && countitem(957) > 9 && countitem(518) > 9) {
+			if ((BaseJob == Job_Swordman && JobLevel >= 30) || BaseJob == Job_Knight || BaseJob == Job_Crusader) {
+				mes "[Juan]";
+				mes "Ooh. Young swordsman!";
+				mes "You are ready to learn the";
+				mes "newest skill, Auto Berserk?!";
+				next;
+				switch(select("Hoho, I would like to learn it now.:What is that?")) {
+				case 1:
+					mes "[Juan]";
+					mes "Ok. Then..";
+					next;
+					delitem 924,35; //Powder_Of_Butterfly
+					delitem 958,10; //Horrendous_Mouth
+					delitem 957,10; //Decayed_Nail
+					delitem 518,10; //Honey
+					skill 146,1,0;
+					mes "[Juan]";
+					mes "You have just become a swordsman";
+					mes "that can use Auto Berserk.";
+					mes "You can go about ";
+					mes "and achieve great things!";
+					next;
+					mes "[Juan]";
+					mes "Good luck!";
+					next;
+					mes "[Juan]";
+					mes "....................................oh yeah.";
+					mes "I forgot to say something.";
+					mes "There are some things you must keep in mind.";
+					next;
+					mes "[Juan]";
+					mes "Once you regain health,";
+					mes "this skill will subside.";
+					mes "Also, there isn't really a time limit";
+					mes "but it can still disappear when";
+					mes "it is attacked with a skill that can";
+					mes "nullify provoke.";
+					next;
+					mes "[Juan]";
+					mes "If you don't remember these characteristics,";
+					mes "you may run into some problems on the battlefield";
+					mes "when the skill disappears all of a sudden.";
+					next;
+					mes "[Juan]";
+					mes "Then... bye for real~";
+					close;
+				case 2:
+					mes "[Juan]";
+					mes "Auto Berserk?";
+					mes "It's a skill crucial on the battlefield.";
+					mes "When your health is in red,";
+					mes "your hidden potential provokes yourself";
+					mes "to help you in battle.";
+					next;
+					mes "[Juan]";
+					mes "It is perfect for those that";
+					mes "fight on the battlefield like fire!";
+					mes "With your ability, you can learn";
+					mes "this skill right now.";
+					mes "Then, I shall tell you the necessary materials.";
+					next;
+					mes "[Juan]";
+					mes "You need 35 Powder of Butterfly.";
+					mes "The energy from the magnificent";
+					mes "wings of a butterfly will";
+					mes "help you gather your strength!";
+					mes "And 10 Horrendous Mouth.";
+					mes "10 Decayed Nail.";
+					mes "and last but not least...";
+					mes "10 Honey!";
+					next;
+					mes "[Juan]";
+					mes "Did you get all that down?";
+					mes "As always, please come back";
+					mes "when you are ready.";
+					mes "I look forward to seeing you again.";
+					close;
+				}
+			}
+		}
 		mes "[Juan]";
-		mes "A surge of energy will flow through your body giving you greater attack power at the cost of defensive strength.";
-		mes "With this you will be able to fight on with a FIERY RAGE and an absolute disregard to your own safety!!";
+		mes "Oh no, you have more injuries";
+		mes "since the last time I saw you.";
+		mes "You went into battle like this?";
+		mes "Seems like you are straining yourself.";
 		next;
 		mes "[Juan]";
-		mes "The enemy will be shocked by your new found strength!!";
-		mes "This skill is especially great for those who fight with a no-holds-bar mentality.";
+		mes "Even though you may have a lot of strength";
+		mes "you can't do much when you reach your limits so";
+		mes "don't overestimate your powers.";
+		mes "Of course you could always use the";
+		mes "skill we developed to overcome these limits.";
 		next;
+		switch(select("Eh! What are you talking about?:Haha, there can't be such a thing.:Keuuuuuuuh!")) {
+		case 1:
+			mes "[Juan]";
+			mes "The skill is called Berserk.";
+			mes "It is deemed the flower of a battlefield.";
+			mes "When your health is red,";
+			mes "your hidden potential is provokes yourself";
+			mes "to help you in battle.";
+			next;
+			mes "[Juan]";
+			mes "It is perfect for those that";
+			mes "fight on the battlefield like fire!";
+			mes "With your ability, you can learn";
+			mes "this skill right now.";
+			mes "Then, I shall tell you the necessary materials.";
+			next;
+			mes "[Juan]";
+			mes "You need 35 Powder of Butterfly.";
+			mes "The energy from the magnificent";
+			mes "wings of a butterfly will";
+			mes "help you gather your strength!";
+			mes "And 10 Horrendous Mouth.";
+			mes "10 Decayed Nail.";
+			mes "and last but not least...";
+			mes "10 Honeys!";
+			next;
+			mes "[Juan]";
+			mes "Did you get all that down?";
+			mes "As always, please come back";
+			mes "when you are ready.";
+			mes "I look forward to seeing you again.";
+			close;
+		case 2:
+			mes "[Juan]";
+			mes "Bleh, were you fooled all your life.";
+			mes "I don't know. Don't talk to me.";
+			close;
+		case 3:
+			mes "[Juan]";
+			mes "Keuuuuuuuuuuuuuh!";
+			mes "Ooowwwwwuuuuuuuuuuuuuhhh!";
+			mes "Keuaaaaaaaaaaah!";
+			close;
+		}
+	}
+	else {
 		mes "[Juan]";
-		mes "In order to learn this skill you will need to bring me the following items:";
-		mes "^5555FF35 Powder of Butterfly,";
-		mes "10 Horrendous Mouth,";
-		mes "10 Decayed Nail^000000,";
-		mes "and ^5555FF10 Honeys^000000!";
-		next;
-		mes "[Juan]";
-		mes "Did you get all of that down? Please come back when you are ready.  I look forward to seeing you again.";
-		set BERSERK, 1;
+		mes "Are you enjoying your trip?";
+		mes "I hope you have nice days ahead of you.";
+		mes "Ah, I am just a kind knight Juan.";
+		mes "Don't worry about me too much. Hahaha...";
 		close;
-	M_1:
-		mes "[Juan]";
-		mes "Bleh! Have you been a fool all of your life?? Go away and don't talk to me.";
-		emotion e_pif;
-		close;
-	M_3:
-		mes "[Juan]";
-		mes "Keuuuuuuuuuuuuuuuuuuh!";
-		mes "Oooowwwwwwwwuuuuuuuuuuhhhhhh!";
-		mes "Keuaaaaaaaaaaaaaaaaaah!";
-		close;
-
-	L_LowLvl:
-		mes "Oh, nice to meet you.";
-		next;
-		mes "[Juan]";
-		mes "You can go on your way now.";
-		emotion e_ok;
-		close;
-
-L_Check:
-	if ((countitem(924)<35) && (countitem(957)<10) && (countitem(958)<10) && (countitem(518)<10)) goto L_NoItems;
-	delitem 924,35;
-	delitem 958,10;
-	delitem 957,10;
-	delitem 518,10;
-	mes "Good job my dear friend.  You have all 4 of the items I asked for.";
-	mes "In return I will now teach you the skill: ^FF0000Berserk^000000.";
-	next;
-	mes "[Juan]";
-	mes "Great job you have done well and deserve this skill.";
-	skill 146,1,0;
-	set BERSERK, 0;
-	next;
-	mes "[Juan]";
-	mes "Muhahahaha!! Don't hold back young warrior, fight without any fears or regrets!!";
-	emotion e_gg;
-	close;
-
-	L_NoItems:
-		mes "[Juan]";
-		mes "In order to learn this skill you will need to bring me the following items:";
-		mes "^5555FF35 Powder of Butterfly,";
-		mes "10 Horrendous Mouth,";
-		mes "10 Decayed Nail^000000,";
-		mes "and ^5555FF10 Honeys^000000!";
-		close;
-L_GotSkill:
-
-	mes "You have the eyes of a person who has seen death first hand!!";
-	mes "But, because of Berserk, I'm sure you have been able to escape it many times as well.";
-	emotion e_gasp;
-	close;
-}
+	}
+}
\ No newline at end of file