- Added quest log commands to all job quests.

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

3 files changed, 945 insertions, 1053 deletions

diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt
index 7d6b0a070..9132827b2 100644
--- a/npc/jobs/1-1e/gunslinger.txt
+++ b/npc/jobs/1-1e/gunslinger.txt
@@ -1,13 +1,9 @@
 //===== eAthena Script ======================================= 
 //= Gunslinger Job Quest
 //===== By: ================================================== 
-//= erKURITA & RockmanEXE
-//= Direct credits quote from RockmanExe: 
-//= "info provided by RockmanEXE cause he pwnz0rz yer arse"
-//= DON'T REMOVE THIS! (by request of him, he provided all
-//= the info regarding the quests and shops.)
+//= erKURITA, RockmanEXE, Kisuka
 //===== Current Version: ===================================== 
-//= 2.1c
+//= 2.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -29,408 +25,399 @@
 //= 2.1a Corrected a Typo error ";;". [Samuray22]
 //= 2.1b Corrected some typos errors. (bugreport:1549) [Samuray22]
 //= 2.1c Fixed some missing/messed up item checks. (bugreport:2693) [Kisuka]
+//= 2.2 Updated to match AEGIS script and Added Quest Log commands. [Kisuka]
 //============================================================ 
 
 que_ng,152,167,3	script	Master Miller	901,{
-
-	mes "[Master Miller]";
-	if(Class == Job_Novice && JobLevel > 9)
-	{
-		switch(GUNS_Q)
-		{
-			case 0:
-				mes "I'm a Security Chief and also";
-				mes "a Gunslinger Instructor, you may call me";
-				mes "Master Miller.";
-				next;
-				mes "[Master Miller]";
-				mes "I can't be distracted from my duty";
-				mes "at this moment.";
-				mes "What is it that you want?";
-				next;
-				switch( select( "Nothing much.","I want to become a Gunslinger.") )
-				{
-					case 1:
-						mes "[Master Miller]";
-						mes "Wasting my time is like,";
-						mes "wasting gold.";
-						mes "Get out of my sight immediatly.";
-						close;
-
-					case 2:
-						mes "[Master Miller]";
-						mes "Hmm.";
-						mes "You still look young";
-						mes "but the look in your eyes...";
-						mes "I can sense a powerful force.";
-						next;
-						mes "[Master Miller]";
-						mes "Hmm...Okay.";
-						mes "First, if you have the will to become a Gunslinger";
-						mes "you will need to go through some tests";
-						mes "and also interview and Training Sessions.";
-						next;
-						mes "[Master Miller]";
-						mes "Do you wish to proceed?";
-						next;
-						switch (select ("No, I need time to think.","Sure.") )
-						{
-							case 1:
-								mes "[Master Miller]";
-								mes "Hmm..Is that so.";
-								mes "Well, it is important...";
-								mes "Think carefully and if you have the spirit,";
-								mes "please, come back later.";
-								close;
-
-							case 2:
-								mes "[Master Miller]";
-								mes "Hmm. Okay.";
-								mes "First";
-								mes "deliver this letter I am giving to you";
-								mes "to Payon's Alchemist,";
-								mes "'The Wise Bull Horn'";
-								mes "and hand the letter to him.";
-								next;
-								mes "[Master Miller]";
-								mes "He will judge you and";
-								mes "will report back to us if ";
-								mes "you are up to our standards.";
-								next;
-								mes "["+ strcharinfo(0) +"]";
-								mes "Allright, I'll do that.";
-								set GUNS_Q,1;
-								close;
-						}
-				}
-
-			case 1:	
-				mes "Hurry up and get moving.";
-				mes "'The Wise Bull Horn' is";
-				mes "currently in Payon.";
-				close;
-
-			case 2:
-				mes "I guess he gave you";
-				mes "some errands to run.";
-				next;
-				mes "[Master Miller]";
-				mes "I think he saw potential in you.";
-				mes "Good luck.";
-				close;
-
-			case 3:
-				mes "That's a lot of errands";
-				mes "I already told you, the";
-				mes "old man is pretty serious.";
-				mes "Perform your task well.";
-				close;
-
-			case 4:
-				mes "Mm~ I'll be waiting for your news.";
-				mes "I hope you'll become one of us.";
-				mes "We'll be practically family..";
-				close;
-
-			case 5:
-				if (skillpoint > 0)	{
-					mes "Learn all your Basic Skills first!!";
-					close;
-				}
-				mes "Ohh, I see you got something from the old man";
-				mes "This is rare.";
-				mes "Under normal circumstances...";
-				mes "this would not be allowed...";
-				mes "Nice, nice.";
-				next;
-				mes "[Master Miller]";
-				mes "Mm..Okay.";
-				mes "The old man gave his";
-				mes "blessings, so I do not have any";
-				mes "reason to reject your application.";
-				next;
-				mes "[Master Miller]";
-				mes "Okay, from now on you'll be a Gunslinger.";
-				mes "After this, for every moment that you live,";
-				mes "remember can never leave your side";
-				mes "is your gun. We must remember the gun";
-				mes "and even every one of its bullets";
-				mes "has its own product number,";
-				mes "and can be checked up by us.";
-				next;
-				mes "[Master Miller]";
-				mes "For purchasing guns and ammo";
-				mes "the only place you can buy them";
-				mes "is from our special gunslinger";
-				mes "guild stores in various places.";
-				next;
-				mes "[Master Miller]";
-				mes "Of course, this is tedious.";
-				mes "But this is all to...";
-				mes "not let these guns";
-				mes "fall in the wrong hands, so";
-				mes "please forgive us for any inconvenience.";
-				next;
-				mes "[Master Miller]";
-				mes "There are also";
-				mes "other reasons.";
-				mes "You'll no doubt find some of them";
-				mes "later.";
-				mes "These are all the instructions";
-				mes "from Lady Celena, our";
-				mes "guild leader.";
-				next;
-				mes "[Master Miller]";
-				mes "After a bit of time";
-				mes "we will give you missions.";
-				mes "You will understand more";
-				mes "later.";
-				next;
-				mes "[Master Miller]";
-				mes "I'm sure we'll see each other again.";
-				mes "So here's to a nice time";
-				mes "working together.";
-				nude;
-				callfunc "Job_Change",Job_Gunslinger;
-				callfunc "F_ClearJobVar";
-				set GUNS_Q,6;
-				set @gun_ex,rand(1,2);
-				if(@gun_ex == 1) getitem 13100,1; else getitem 13150,1;
-				close;
-		}
-	} else if(Class == Job_Novice && JobLevel < 10) {
-		mes "Hmm, I think you";
-		mes "have the potential";
-		mes "but you're not yet strong enough.";
-		mes "Keep getting stronger and";
-		mes "come back later.";
-		close;
-	} else if(Class == Job_Gunslinger) {
-		mes "Oh~ It's been a long time~";
-		mes "So, how have your travels been?";
-		mes "Remember, always take care";
-		mes "of your gun.";
-		close;
-	} else if(Class == Job_Baby) {
-		mes "Ouch~";
-		mes "How did a baby come here~";
-		mes "Peekaboo~";
-		next;
+	if (Upper == 2) {
 		mes "[Master Miller]";
-		mes "Where's your mommy~";
-		mes "Haha~";
-		mes "It's a dangerous place here.";
-		mes "Go play somewhere else.";
-		close;
-	} else {
-		mes "Don't get distracted with me.";
-		mes "Get on with your traveling.";
+		mes "Well, aren't you an";
+		mes "adorable little child~";
+		mes "Where's your mommy?";
+		mes "This place is dangerous, so";
+		mes "please go home soon, okay?";
 		close;
 	}
-}
-
-payon,184,65,3	script	The Wise Bull Horn	866,{
-
-	switch(GUNS_Q)
-	{
-		case 0:
-			mes "[The Wise Bull Horn]";
-			mes "Zzz...Zzz";
+	if (Class == Job_Novice) {
+		if (JobLevel < 10 || getskilllv("NV_BASIC") < 9) {
+			mes "[Master Miller]";
+			mes "Interested in becoming";
+			mes "a Gunslinger, eh? You've";
+			mes "got potential, but you're";
+			mes "not yet experienced enough.";
+			mes "Just train yourself a bit more,";
+			mes "and then come back, you hear?";
 			close;
-
-		case 1:
-			mes "[The Wise Bull Horn]";
-			mes "...Hmm... Young one";
-			mes "What is it that you want.";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "Mr. Miller sent me here.";
-			next;
-			mes "[The Wise Bull Horn]";
-			mes "Miller...";
-			mes "Mm...Hmm. So Dark Fox";
-			mes "sent you here...";
-			next;
-			mes "[The Wise Bull Horn]";
-			mes "He is wise and cunning...";
-			mes "that is willing to sacrifice himself for his teammates.";
-			mes "mm...If he sent you..";
-			mes "Then you should be rather capable...";
-			next;
-			mes "[The Wise Bull Horn]";
-			mes "Wait...come closer...";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "....";
-			next;
-			mes "[The Wise Bull Horn]";
-			mes "mmm...";
-			mes "mmmmm....";
-			next;
-			mes "[The Wise Bull Horn]";
-			mes "mmm...Bright eyes and...";
-			mes "a serious face...also...";
-			mes "a very good attitude...a good sense of...";
-			mes "responsibility...";
-			mes "But still not enough.";
-			next;
-			mes "[The Wise Bull Horn]";
-			mes "Lack of experience...";
-			mes "And you still don't have the blessing of the land...";
-			mes "You'll get injured at this rate...";
-			next;
-			mes "[The Wise Bull Horn]";
-			mes "Very well, I shall craft you a gift...";
-			mes "If you wish to follow this path...";
-			mes "Gather 3 Rainbow Shells,";
-			mes "10 Shells, 3 Feathers,";
-			mes "1 Trunk, 3 Zargons, and 3 Green Herbs,";
-			mes "then bring them to me.";
+		}
+		if (GUNS_Q == 0) {
+			mes "[Master Miller]";
+			mes "I'm Miller, a full time";
+			mes "Gunslinger drillmaster, and";
+			mes "full time guardian for Lady";
+			mes "Selena. Now, what do you";
+			mes "need? If it's not important, then I can't make the time for you.";
 			next;
-			mes "[The Wise Bull Horn]";
-			mes "If you show the gift that you just received";
-			mes "to Dark Fox. Then he will definitely...";
-			mes "accept you.";
+			if(select("Nothing.:I want to become a Gunslinger.") == 1) {
+				mes "[Master Miller]";
+				mes "Don't waste my time.";
+				mes "If you do want to become";
+				mes "a Gunslinger, then come";
+				mes "back and talk to me.";
+				close;
+			}
+			mes "[Master Miller]";
+			mes "Hm. You're pretty young, but";
+			mes "your eyes tell me that you're";
+			mes "pretty ambitious. You'll need to pass our interview and educational";
+			mes "course to become a Gunslinger. Do you want to apply for the job?";
 			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "-I'll need-";
-			mes "-3 Rainbow Shells-";
-			mes "-10 Shells, 3 Feathers-";
-			mes "-1 Trunk, 3 Zargons,-";
-			mes "-and 3 Green Herbs.-";
-			set GUNS_Q,2;
-			close;
-
-		case 2:
-			if ((countitem(1013) < 3) || (countitem(935) < 10) || (countitem(949) < 3) || (countitem(1019) < 1) || (countitem(912) < 3) || (countitem(511) < 3))
-			{
-				mes "["+ strcharinfo(0) +"]";
-				mes "-I'll need-";
-				mes "-3 Rainbow Shells-";
-				mes "-10 Shells, 3 Feathers-";
-				mes "-1 Trunk, 3 Zargons,-";
-				mes "-and 3 Green Herbs.-";
+			if(select("Give me some time to think.:Sure!") == 1) {
+				mes "[Master Miller]";
+				mes "Understandable.";
+				mes "If you do decide that";
+				mes "you want to become";
+				mes "a Gunslinger, then let";
+				mes "me know right away.";
+				mes "I'll get you started.";
 				close;
 			}
-			mes "[The Wise Bull Horn]";
-			mes "Oh...give them to me.";
-			mes "There is time to be consumed to";
-			mes "make the gift, wait for a while.";
-			delitem  935,10;
-			delitem  949,3;
-			delitem 1019,1;
-			delitem  912,3;
-			delitem  511,3;
-			delitem 1013,3;
-			set GUNS_Q,3;
+			mes "[Master Miller]";
+			mes "Great, great. Alright then,";
+			mes "let's get you started. Take";
+			mes "this letter to Mr. Wise Bull";
+			mes "Horn in Payon. He's a shaman";
+			mes "that will judge whether or not";
+			mes "you qualify to be a Gunslinger.";
+			set GUNS_Q,1;
+			setquest 6020;
 			close;
-
-		case 3:
-			mes "[The Wise Bull Horn]";
-			mes "Mm...You came right on time.";
-			mes "The preparation finished just now.";
-			mes "It is a rather simple gift.";
-			mes "But that's because I haven't worked in so long.";
-			mes "Ahh...I feel tired now...";
-			next;
-			mes "[The Wise Bull Horn]";
-			mes "The last time I crafted this...";
-			mes "Was well over ten years ago.";
-			mes "I also followed this path once...";
-			mes "and I once battled...";
-			mes "with such an item.";
-			next;
-			mes "[The Wise Bull Horn]";
-			mes "Meeting Celena's father";
-			mes "feels just like yesterday,";
-			mes "time really flies.";
-			mes "Like the smooth western wind.";
-			next;
-			mes "[The Wise Bull Horn]";
-			mes "Though there would always be painful";
-			mes "memories...but my followers...";
-			mes "especially people like...";
-			mes "Celena and Dark Fox.";
-			mes "Ahh, young people, and my followers...";
-			mes "I thank you...";
-			next;
-			mes "[The Wise Bull Horn]";
-			mes "Though now, I am already old...";
-			mes "In a short while...";
-			mes "I will return...to the land";
-			next;
-			mes "[The Wise Bull Horn]";
-			mes "I feel so tired...";
-			mes "I'm so sorry...but if you could...";
-			mes "Promise me something...";
-			mes "Promise to do...something for me.";
-			next;
-			mes "[The Wise Bull Horn]";
-			mes "I suddenly feel like...";
-			mes "drinking a glass of milk.";
-			next;
-			mes "[The Wise Bull Horn]";
-			mes "Take it as a request...from an old man.";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "-Let's get a glass of Milk-";
-			mes "For 'The Wise Bull Horn'.-";
-			set GUNS_Q, 4;
+		}
+		else if(GUNS_Q == 1) {
+			mes "[Master Miller]";
+			mes "Take that letter of";
+			mes "introduction I've written";
+			mes "for you to Mr. Wise Bull";
+			mes "Horn in Payon. He'll test";
+			mes "you to see if you're really";
+			mes "Gunslinger material.";
 			close;
-		
-		case 4:
-			if (countitem(519) < 1)
-			{
-				mes "["+ strcharinfo(0) +"]";
-				mes "-Let's get a glass of Milk-";
-				mes "-for 'The Wise Bull Horn'.-";
+		}
+		else if(GUNS_Q == 2) {
+			mes "[Master Miller]";
+			mes "Hmm... Wise Bull Horn";
+			mes "asked you to collect the";
+			mes "items you need to make the";
+			mes "voucher? Hm. I guess that's";
+			mes "part of his qualification test.";
+			close;
+		}
+		else if(GUNS_Q == 3) {
+			mes "[Master Miller]";
+			mes "Wise Bull Horn asked";
+			mes "you to bring him some";
+			mes "Milk? He must really like";
+			mes "you if he's already asking";
+			mes "for favors. Good luck, friend.";
+			close;
+		}
+		else if(GUNS_Q == 4) {
+			mes "[Master Miller]";
+			mes "I expect to hear good";
+			mes "news from you soon. You";
+			mes "know, I have no doubt that";
+			mes "you'll become a Gunslinger.";
+			close;
+		}
+		else if(GUNS_Q == 5) {
+			if (Skillpoint != 0) {
+				mes "[Master Miller]";
+				mes "Hey, you have leftover";
+				mes "Skill Points. You better";
+				mes "use them all up before you";
+				mes "come and talk to me again.";
 				close;
 			}
-			mes "[The Wise Bull Horn]";
-			mes "Thank you.";
-			mes "You are truly a kind young man.";
-			mes "Now get on the road.";
-			delitem 519,1;
-			set GUNS_Q,5;
+			mes "[Master Miller]";
+			mes "Oh, you've brought a";
+			mes "voucher from Wise Bull Horn?";
+			mes "It's been a while since he's";
+			mes "given one to anybody, so";
+			mes "I'm really proud of you!";
 			next;
-			mes "[The Wise Bull Horn]";
-			mes "Take this Gift made by me";
-			mes "and show it to Dark Fox.";
-			mes "You have my blessings";
-			mes "to become a Gunslinger.";
+			mes "[Master Miller]";
+			mes "If Wise Bull Horn approves,";
+			mes "then I have no reason to";
+			mes "reject you. Alright then, I'll";
+			mes "promote you to a Gunslinger.";
+			mes "But first, let me explain";
+			mes "our job in more detail.";
 			next;
-			mes "[The Wise Bull Horn]";
-			mes "Ee~~Ye~Ee~~ Hooma~ Raa~~Nae~Eee~~";
-			mes "Ee~~Ye~Ee~~ Hooma~ Raa~~Nae~Eee~~";
+			mes "[Master Miller]";
+			mes "As a Gunslinger, you must";
+			mes "keep your gun with you at";
+			mes "all times. The Gunslinger";
+			mes "Guild keeps track of every Gun";
+			mes "and Bullet, so you can only get";
+			mes "them from our guild members.";
 			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "-Singing a weird-";
-			mes "-song-";
-			mes "-'The Wise Bull Horn'. I feel strange.-";
-			mes "-Let's take the Gift-";
-			mes "-to Mr.Miller now.-";
-			close;
-
-		case 5:
-			mes "[The Wise Bull Horn]";
-			mes "Ee~~Ye~Ee~~ Hooma~ Raa~~Nae~Eee~~";
-			mes "Ee~~Ye~Ee~~ Hooma~ Raa~~Nae~Eee~~";
+			mes "[Master Miller]";
+			mes "Don't worry, Gunslinger";
+			mes "Guildsmen can be found almost";
+			mes "anywhere these days. Anyway,";
+			mes "it has to be this way by order of our guild leader, Lady Selena.";
 			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "-Singing a weird-";
-			mes "-song-";
-			mes "-'The Wise Bull Horn'.-";
+			mes "[Master Miller]";
+			mes "You might get the chance to";
+			mes "meet her one of these days.";
+			mes "Anyway, just now that we have";
+			mes "to regulate Gun and Bullet sales to keep them away from evil";
+			mes "or irresponsible folk.";
 			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "-I feel strange.-";
-			mes "-Let's take the Gift-";
-			mes "-to Mr.Miller now.-";
+			mes "[Master Miller]";
+			mes "In any case, it's always";
+			mes "a pleasure for me to talk";
+			mes "to another Gunslinger, so";
+			mes "let's keep in touch. May the";
+			mes "power of the earth protect";
+			mes "you in all of your adventures~";
+			callfunc "Job_Change",Job_Gunslinger;
+			set GUNS_Q,6;
+			completequest 6024;
+			if (rand(1,2) == 1) {
+				getitem 13100,1;	// Six_Shooter
+			}else{
+				getitem 13150,1;	// Branch
+			}
+			close;
+		}
+	}else{
+		if (Class == Job_Gunslinger) {
+			mes "[Master Miller]";
+			mes "Oh! Long time, no see,";
+			mes "friend. How have you been?";
+			mes "I hope you've been keeping";
+			mes "you Gun well maintained.";
+			mes "Take care of it, and it'll take";
+			mes "care of you. Remember it.";
 			close;
-		
-		case 6:
-			mes "[The Wise Bull Horn]";
-			mes "Mm...It's been a while.";
-			mes "Hopefully you'll become a strong Gunslinger.";
+		}else{
+			mes "[Master Miller]";
+			mes "If you don't have";
+			mes "any business with me,";
+			mes "then please go on your way.";
 			close;
+		}
 	}
 }
+
+payon,184,65,3	script	Wise Bull Horn	866,{
+	if (GUNS_Q == 1) {
+		mes "[Wise Bull Horn]";
+		mes "Hello, young wolf.";
+		mes "What business has";
+		mes "brought you before me?";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Mr. Miller sent me to";
+		mes "deliver this letter to you.";
+		mes "Actually, I'm interested in";
+		mes "becoming a Gunslinger...";
+		next;
+		mes "[Wise Bull Horn]";
+		mes "Miller, you said?";
+		mes "Hm, the Black Fox doesn't";
+		mes "give introductions for anyone";
+		mes "he doesn't believe will make";
+		mes "a good Gunslinger. Yes, I think";
+		mes "I know why he sent you to me.";
+		next;
+		mes "[Wise Bull Horn]";
+		mes "I can see it in your eyes:";
+		mes "you've got a warm heart and a";
+		mes "strong sense of responsibility.";
+		mes "All you need is the blessing";
+		mes "of the Earth to protect you";
+		mes "as a Gunslinger.";
+		next;
+		mes "[Wise Bull Horn]";
+		mes "I can make a voucher that";
+		mes "will demonstrate your desire";
+		mes "to become a warrior of the";
+		mes "earth for you to present to";
+		mes "Gunslinger drillmasters.";
+		mes "I shall need these items...";
+		next;
+		mes "[Wise Bull Horn]";
+		mes "^3355FF1 Trunk^000000,";
+		mes "^3355FF3 Fluffs^000000,";
+		mes "^3355FF3 Zargons^000000,";
+		mes "^3355FF10 Shells^000000,";
+		mes "^3355FF3 Green Herbs^000000, and";
+		mes "^3355FF3 Rainbow Shells^000000.";
+		next;
+		mes "[Wise Bull Horn]";
+		mes "After I complete the";
+		mes "voucher, you may bring";
+		mes "it to Black Fox, and he";
+		mes "will help you achieve";
+		mes "your goal of becoming";
+		mes "a Gunslinger.";
+		set GUNS_Q,2;
+		changequest 6020,6021;
+		close;
+	}
+	else if(GUNS_Q == 2) {
+		if (countitem(912) < 3 || countitem(914) < 3 || countitem(1019) < 1 || countitem(935) < 10 || countitem(511) < 3 || countitem(1013) < 3) {
+			mes "[Wise Bull Horn]";
+			mes "I can make a voucher that";
+			mes "will demonstrate your desire";
+			mes "to become a warrior of the";
+			mes "earth for you to present to";
+			mes "Gunslinger drillmasters.";
+			mes "I shall need these items...";
+			next;
+			mes "[Wise Bull Horn]";
+			mes "^3355FF1 Trunk^000000,";
+			mes "^3355FF3 Fluffs^000000,";
+			mes "^3355FF3 Zargons^000000,";
+			mes "^3355FF10 Shells^000000,";
+			mes "^3355FF3 Green Herbs^000000, and";
+			mes "^3355FF3 Rainbow Shells^000000.";
+			next;
+			mes "[Wise Bull Horn]";
+			mes "After I complete the";
+			mes "voucher, you may bring";
+			mes "it to Black Fox, and he";
+			mes "will help you achieve";
+			mes "your goal of becoming";
+			mes "a Gunslinger.";
+			close;
+		}
+		delitem 912,3;	// Zargon
+		delitem 914,3;	// Fluff
+		delitem 1019,1;	// Wooden_Block
+		delitem 935,10;	// Shell
+		delitem 511,3;	// Green_Herb
+		delitem 1013,3;	// Colorful_Shell
+		set GUNS_Q,3;
+		changequest 6021,6022;
+		mes "[Wise Bull Horn]";
+		mes "Ah, you've returned";
+		mes "with everything I need.";
+		mes "Please give me some time";
+		mes "to make the voucher. If you";
+		mes "come back in a little while,";
+		mes "I should be finished with it.";
+		close;
+	}
+	else if(GUNS_Q == 3) {
+		mes "[Wise Bull Horn]";
+		mes "Oh, you've arrived just";
+		mes "in time. It's been a while";
+		mes "since I've made one of these vouchers, so I might be a little";
+		mes "rusty. Still, this really takes me back to the days of my youth.";
+		next;
+		mes "[Wise Bull Horn]";
+		mes "I've been serving in this";
+		mes "position of choosing worthy";
+		mes "recipients of Gunslinger";
+		mes "vouchers for a few decades";
+		mes "now. But before that, I was a";
+		mes "young adventurer just like you.";
+		next;
+		mes "[Wise Bull Horn]";
+		mes "It feels like it was only";
+		mes "yesterday when I held my own";
+		mes "little voucher as a Gunslinger,";
+		mes "a warrior of the earth. That's";
+		mes "when I met Selena's father...";
+		mes "How can time pass so quickly?";
+		next;
+		mes "[Wise Bull Horn]";
+		mes "Ah... I reallly appreciate";
+		mes "Selena and Black Fox for all";
+		mes "of their help in recruiting";
+		mes "young Gunslingers. I'm very";
+		mes "old now, and can't do everything by myself. *Sigh...* Such is life.";
+		next;
+		mes "[Wise Bull Horn]";
+		mes "Before you leave, may";
+		mes "I ask you for a small favor?";
+		mes "I'm thirsty, and would like";
+		mes "a cold glass of Milk. Would";
+		mes "you please bring me some?";
+		set GUNS_Q,4;
+		changequest 6022,6023;
+		close;
+	}
+	else if(GUNS_Q == 4) {
+		if (countitem(519) < 1) {
+			mes "[Wise Bull Horn]";
+			mes "I'm an old man that will";
+			mes "soon be reunited with mother";
+			mes "earth. Would you do this old";
+			mes "Gunslinger a favor a bring me";
+			mes "a cold glass of Milk, please?";
+			close;		
+		}
+		delitem 519,1;	// Milk
+		set GUNS_Q,5;
+		changequest 6023,6024;
+		mes "[Wise Bull Horn]";
+		mes "Oh, thank you for your!";
+		mes "generosity--I see that";
+		mes "you've brought me some";
+		mes "Milk. Ahhhh, delicious~";
+		next;
+		mes "[Wise Bull Horn]";
+		mes "I admire the patience,";
+		mes "gentleness, and kindness";
+		mes "that you've proven by bringing";
+		mes "this to me. Yes, those are traits we all want Gunslingers to have.";
+		next;
+		mes "[Wise Bull Horn]";
+		mes "Now, please take this voucher";
+		mes "to Miller, the Black Fox, with";
+		mes "my whole hearted approval.";
+		mes "I hope that you will use your";
+		mes "gun to uphold justice as a";
+		mes "noble warrior of the earth.";
+		next;
+		mes "[Wise Bull Horn]";
+		mes "Eeh~Yeah~Eeh~Hooom";
+		mes "Eeh~Yeah~Eeh~Hooom";
+		mes "Maaaaarrraaa Neeey~";
+		mes "Yippee Yippee Yai Yocaiyay~";
+		close;
+	}
+	else if(GUNS_Q == 5) {
+		mes "[Wise Bull Horn]";
+		mes "Please take this voucher";
+		mes "to Miller, the Black Fox, with";
+		mes "my whole hearted approval.";
+		mes "I hope that you will use your";
+		mes "gun to uphold justice as a";
+		mes "noble warrior of the earth.";
+		next;
+		mes "[Wise Bull Horn]";
+		mes "Eeh~Yeah~Eeh~Hooom";
+		mes "Eeh~Yeah~Eeh~Hooom";
+		mes "Maaaaarrraaa Neeey~";
+		mes "Yippee Yippee Yai Yocaiyay~";
+		close;
+	}
+	else if(GUNS_Q == 6) {
+		mes "[Wise Bull Horn]";
+		mes "AAh, long time no see.";
+		mes "I hope that you become";
+		mes "a smart beast, and use";
+		mes "your powers as a Gunslinger to protect what is good and just.";
+		close;
+	}
+	else {
+		mes "[Wise Bull Horn]";
+		mes "Zzzzzz~";
+		mes "^333333*Phew*^000000";
+		close;
+	}
+}
\ No newline at end of file
diff --git a/npc/jobs/1-1e/ninja.txt b/npc/jobs/1-1e/ninja.txt
index ff4ed9c37..436e7580e 100644
--- a/npc/jobs/1-1e/ninja.txt
+++ b/npc/jobs/1-1e/ninja.txt
@@ -1,11 +1,11 @@
 //===== eAthena Script ======================================= 
 //= Ninja Job Quest
 //===== By: ================================================== 
-//= Legionaire
+//= Legionaire, Kisuka
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.5
 //===== Compatible With: ===================================== 
-//= eAthena SVN that supports Ninjas
+//= eAthena SVN
 //===== Description: ========================================= 
 //= Ninja Job Change Quest
 //===== Additional Comments: ================================= 
@@ -13,675 +13,573 @@
 //= 1.2 Added Akagi [Playtester]
 //= 1.3 Updated dialogs to official ones and optimized [SinSloth]
 //= 1.4 Fixed a minor bug [SinSloth]
+//= 1.5 Updated to match AEGIS script and Added Quest Log commands. [Kisuka]
 //============================================================ 
 
-alberta,30,65,3	script	Akagi#nq	730,{
-
-	if(Class == Job_Novice)
-	{
-		if(JobLevel > 9)
-		{
+alberta,30,65,3	script	Akagi	730,{
+	if (Class == Job_Novice) {
+		if (JobLevel == 10) {
 			mes "[Akagi]";
-			mes "Hmm...";
-			mes "Some force must have lead your feet to this dark alley because you are needed here.";
-			mes "Would you like to walk the path of Patience?";
-			next;
-			if(select("No, I don't want to go.:Yep, I'll walk the path.") == 1)
-			{
+			mes "Hmmm...";
+			mes "You must have come,";
+			mes "sensing that someone";
+			mes "is waiting for you here.";
+			mes "Tell me, do you seek";
+			mes "the path of patience?";
+			next;
+			if(select("No:Yes") == 1) {
 				mes "[Akagi]";
-				mes "Ok.";
-				mes ".....";
-				mes "Then farewell.";
+				mes "I see.";
+				mes "To each his own,";
+				mes "I suppose. Take";
+				mes "care of yourself.";
 				close;
 			}
-			else
-			{
-				mes "[Akagi]";
-				mes "Very well, I'll send you over right away.";
-				close2;
-				switch (rand(3)) {
-					case 1:  warp "amatsu", 170, 229; break;
-					case 2:  warp "amatsu", 216, 188; break;
-					default: warp "amatsu", 178, 176; break;
-				}
-				end;
+			mes "[Akagi]";
+			mes "Very well.";
+			mes "Then, let me";
+			mes "set you on that";
+			mes "path right away...";
+			close2;
+			switch(rand(3)) {
+				case 1:
+					warp "amatsu",170,229;
+					end;
+				case 2:
+					warp "amatsu",216,188;
+					end;
+				default:
+					warp "amatsu",178,167;
+					end;
 			}
-		}
-		else
-		{
+		}else{
 			mes "[Akagi]";
-			mes "This isn't where you should be.";
-			mes "Come back after you've become stronger.";
+			mes "Hm? I cannot be";
+			mes "of any service to";
+			mes "you until you grow";
+			mes "a little stronger...";
 			close;
 		}
-	}
-	else
-	{
+	}else{
 		mes "[Akagi]";
-		mes "I have nothing to say to you.";
-		mes "Go back to where you came from.";
-		close;
-	}
-}
-
-que_ng,30,65,3	script	Cougar Gai	730,{
-
-	if(Class == Job_Novice && JobLevel > 9)
-	{
-		switch(NINJ_Q)
-		{
-			case 0:
-				mes "["+strcharinfo(0)+"]";
-				mes "Excuse me.";
-				next;
-				mes "[Cougar Gai]";
-				mes "Hmm...?";
-				mes "What the~!!";
-				mes "You can see me!";
-				next;
-				mes "[Cougar Gai]";
-				mes "Toriyaaa~!";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "-He throws a bundle of wooden chopsticks at you-";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "-Dart dart dart!-";
-				mes "Oww~!";
-				mes "Jeez~! What do you think you're doing!";
-				next;
-				mes "[Cougar Gai]";
-				mes "Hmm...?";
-				mes "I see you're not a hitman sent to kill me.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Oh jeez... What did I get myself into.";
-				mes "This guy is nuts.";
-				mes "Hasn't even seen me and is throwing stuff around...";
-				next;
-				mes "[Cougar Gai]";
-				mes "Urrgh~! Anger, anger~~";
-				mes "My forever rival and enemy...";
-				mes "Field Cat Joe!";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "........";
-				next;
-				mes "[Cougar Gai]";
-				mes "Gahhhhh~~~!!!";
-				mes "Urrgh~Urrgh~";
-				mes "Pft! Pft! Pft~";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "-What the.. He's not listening to me at all-";
-				next;
-				mes "[Cougar Gai]";
-				mes "Hmm...";
-				mes "What the! Who are you?!";
-				mes "And how did you get so close to me out of nowhere?";
-				mes "Take this!";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Agh~";
-				mes "Ugh, please, can you quit that?";
-				mes "What you've done so far, anyway...";
-				next;
-				mes "[Cougar Gai]";
-				mes "Oho";
-				mes "What incredible skill~";
-				mes "You've evaded all my techniques.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "- What techniques is he talking about? -";
-				mes "- And he's still not listening to me... -";
-				next;
-				mes "[Cougar Gai]";
-				mes "Hmm~ Yes~";
-				mes "Do you have some business with me?";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes ".........";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Ah...umm...";
-				mes "Yes.";
-				mes "I came to see you because I want to be a Ninja.";
-				next;
-				mes "[Cougar Gai]";
-				mes "Oho~ You've come to the right person.";
-				mes "But!";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes ".....";
-				next;
-				mes "[Cougar Gai]";
-				mes "It might be a little tough.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Huh~ Why~";
-				next;
-				mes "[Cougar Gai]";
-				mes "First off, I don't know if I can really trust you, and in my opinion..";
-				mes "It seems you don't have enough experience.";
-				next;
-				mes "[Cougar Gai]";
-				mes "So that's why i'm going to say..";
-				mes "Go!!! Get Lost~!";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "...........";
-				next;
-				mes "[Cougar Gai]";
-				mes "Hmm yes...";
-				mes "That's my final word.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "...........";
-				next;
-				mes "[Cougar Gai]";
-				mes "Well, get going if you understood.";
-				mes "As you can see, I'm a very busy person...";
-				next;
-				mes "[Cougar Gai]";
-				mes "I have a lot of enemies around me, so I can't let my guard down for a single moment.";
-				next;
-				mes "[Cougar Gai]";
-				mes "I'm better leave to train for my next duel.";
-				mes "Yioooop~!";
-				next;
-				mes "[Cougar Gai]";
-				mes "Next time I will win for sure!";
-				mes "Just you wait!";
-				mes "Field Cat Joe!";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Field Cat Joe ?";
-				mes "Why are you fighting with a cat?";
-				next;
-				mes "[Cougar Gai]";
-				mes "Huh? Oh oops! Hahaha~ Hehe~";
-				mes "Field Cat is that guy nickname.";
-				next;
-				mes "[Cougar Gai]";
-				mes "He's a very mischievous fellow.";
-				mes "Ther's not a method he won't use to win.";
-				next;
-				mes "[Cougar Gai]";
-				mes "And not only that -- The skills he uses are very brilliant and very strong.";
-				next;	
-				mes "[Cougar Gai]";
-				mes "It just so happens him and I have run out of Shuriken and Scrolls, so we're in a truce. Haha.";
-				next;
-				mes "[Cougar Gai]";
-				mes "Well, if you really want to become a Ninja, how about you do me a favor?";
-				mes "If you fulfill this favor well, then although I can't make you a ninja, I can teach you a few techniques. You never know!";
-				next;
-				switch( select( "Accept to do the favor","Refuse to do the favor" ) )
-				{
-
-					case 1:
-						mes "["+strcharinfo(0)+"]";
-						mes "Hmm... Ok.";
-						next;
-						mes "[Cougar Gai]";
-						mes "Ok.. Very well.";
-						mes "Then deliver this letter to Field Cat Joe.";
-						next;
-						mes "[Cougar Gai]";
-						mes "It just says in there that until we're prepared, we should consider a truce.";
-						mes "Absolutely make sure to bring back his reply.";
-						next;
-						mes "[Cougar Gai]";
-						mes "By the way, my sources told me Field Cat Joe has gone to Einbroch.";
-						mes "Not sure why he went there though...";
-						next;
-						mes "[Cougar Gai]";
-						mes "He's pretty good in changing his appearance,";
-						mes "so it might be very difficult to find him.";
-						next;
-						mes "[Cougar Gai]";
-						mes "You'll have to look with your eyes peeled and search. He likes high places.";
-						mes "Look around well.";
-						next;
-						mes "["+strcharinfo(0)+"]";
-						mes "Ok~";
-						mes "I'll do it.";
-						set NINJ_Q,1;
-						close;
-
-					case 2:
-						mes "["+strcharinfo(0)+"]";
-						mes "I don't wish to simply learn a few techniques.";
-						mes "I'm sorry.";
-						mes "I'll go find someone else.";
-						mes "Find somebody else.";
-						next;
-						mes "[Cougar Gai]";
-						mes "Hmm... I see...";
-						mes "I understand.";
-						mes "I guess I wasted my breath.";
-						mes "Well, off with you now.";
-						close;
-				}
-
-			case 1:
-				mes "[Cougar Gai]";
-				mes "Hmm... It's nothing I need immediately, but do hurry.";
-				mes "Field Cat Joe is at Einbroch.";
-				close;
-
-			case 2:
-				mes "[Cougar Gai]";
-				mes "Don't forget to bring me back his reply.";
-				mes "I have to make sure he doesn't claim otherwise later.";
-				close;
-
-			case 3:
-				mes "[Cougar Gai]";
-				mes "Did you bring me back his reply?";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Yes, here it is.";
-				next;
-				mes "[Cougar Gai]";
-				mes "Ohh. I see you've met him and brought me his reply.";
-				mes "Well... Let's See.";
-				mes "- Rip rip... -";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "- He carefully reads the letter you brought to him -";
-				next;
-				mes "[Cougar Gai]";
-				mes "Ugh~!!! How can this be!";
-				mes "He refused my request for a short truce!!!";
-				mes "Did he remake his Kunai?";
-				mes "What now...";
-				next;
-				mes "[Cougar Gai]";
-				mes "I'm sorry, but I'd appreciate it if you can do me a favor.";
-				mes "I need to create weapons to fight against that Bastard Joe but I don't have enough ingredients.";
-				next;
-				mes "[Cougar Gai]";
-				mes "If you can get me these ingredients, then i'll acknowledge your abilities and make you a ninja.";
-				mes "What I need is...";
-				mes "1 Phracon and 5 Cyfar.";
-				mes "Time is of the essence, so please hurry.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Wait!!";
-				mes "Those are...";
-				next;
-				mes "[Cougar Gai]";
-				mes "What's the matter? Is there a problem?";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "I just got these ingredients for Joe...";
-				mes "Uggghhhh...";
-				next;
-				mes "[Cougar Gai]";
-				mes "What did you say?!!!";
-				mes "Then by sending you to him, I've ended up helping him...!";
-				mes "Ugh...";
-				mes "Aaahhh...";
-				mes "Why, why~ What a fool I am! An Idiot! A moron!!";
-				next;
-				mes "[Cougar Gai]";
-				mes "Ah.. Ah.. I'll calm down.";
-				mes "Hugh.. Hugh..";
-				next;
-				mes "[Cougar Gai]";
-				mes "You must help me, for now.";
-				mes "Since things have become like this, there's no time to explain now.";
-				mes "Hurry and get me what I need.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Uhh...Sure..";
-				next;
-				mes "[Cougar Gai]";
-				mes "Hurrrry~~!!";
-				mes "Sob~";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "- Let's bring Mr. Gai 1 Phracon -";
-				mes "- And 5 Cyfars -";
-				set NINJ_Q,4;
-				close;
-
-			case 4:
-				mes "[Cougar Gai]";
-				if(countitem(7053) < 5 || countitem(1010) < 1)
-				{
-					mes "Get me 1 Phracon and 5 Cyfars.";
-					mes "What you have isn't what I said I need before.";
-					mes "It's urgent, so please hurry.";
-					close;
-				}
-				if(skillpoint >0)
-				{
-					mes "Please come back after you've learned all the basic skills.";
-					close;
-				}
-				mes "Oh, Did you bring me the things I need?";
-				mes "Let's see...";
-				mes "Hmm~ I see you've brought me what I need.";
-				next;
-				mes "[Cougar Gai]";
-				mes "Whew~ You've made it in time.";
-				mes "You work better than I thought.";
-				next;
-				mes "[Cougar Gai]";
-				mes "Very well.";
-				mes "As promised, I'll officially turn you into a Ninja.";
-				next;
-				mes "[Cougar Gai]";
-				mes "Let me properly introduce myself.";
-				mes "I am an Upper Rank Ninja from the Doga Ninja Clan of the East.";
-				mes "I'm operating as a Search Captain to find Kazuma-san, the leader of the village I'm from.";
-				next;
-				mes "[Cougar Gai]";
-				mes "Tell you the truth, there's a lot of complication going on internally in the Ninja Clan lately, which was why I was hesitant to allow you to become a Ninja.";
-				next;
-				mes "[Cougar Gai]";
-				mes "But seeing how Joe has complimented you highly and have completed my request well, I've changed my mind.";
-				next;
-				mes "[Cougar Gai]";
-				mes "Being a Ninja is a lonely job.";
-				mes "You must value your jobs but also never forget your humanity.";
-				next;
-				mes "[Cougar Gai]";
-				mes "You're in for a lot of struggle from here on.";
-				mes "Although we keep our identity secret, we operate in every single town.";
-				next;
-				mes "[Cougar Gai]";
-				mes "The creation and usage of the basic equiptment of Ninjas is kept secret.";
-				mes "The purchase and sale of Ninja gear is strictly regulated, so try to be careful.";
-				next;
-				mes "[Cougar Gai]";
-				mes "Well, I hereby recognize you as a member of the Doga Ninja Clan.";
-				next;
-				mes "[Cougar Gai]";
-				mes "Be quick as a Hawk from the Wind of the East.";
-				mes "And light as a Leaf wavering in the Wind of the West!!";
-				next;
-				mes "[Cougar Gai]";
-				mes "Haaa!!!!";
-				next;
-				nude;
-				callfunc "Job_Change",Job_Ninja;
-				callfunc "F_ClearJobVar";				
-				getitem 13010,1;
-				close;
-
-		}
-	}
-	else if(Class == Job_Novice && JobLevel < 10)
-	{
-		mes "[Cougar Gai]";
-		mes "It looks like you need to train more.";
-		mes "Come back after you gained more muscle.";
-		close;
-	}
-	else if(Class == Job_Ninja)
-	{
-		mes "[Cougar Gai]";
-		mes "Hmm, how have you been?";
-		mes "You don't know when and where you may be asked to go on a mission, so don't put off your training for a single day.";
-		close;
-	}
-	else if(Class == Job_Baby)
-	{
-		mes "[Cougar Gai]";
-		mes "What the...! A super baby!";
-		mes "Has this location been so exposed that even babies know where it is?";
-		mes "Oh no~ Ah no~";
-		close;
-	}
-	else
-	{
-		mes "[Cougar Gai]";
-		mes "What the.. What's that stench?!";
-		mes "I was wondering what was causing that stench -- it was you.";
-		mes "Why, you're so young, there's still a milk mustache on your lips from drinking from your mother's bosoms.";
-		mes "Get lost, squirt.";
+		mes "Hmm...";
+		mes "You and I...";
+		mes "We are fairly equal in";
+		mes "terms of combat ability.";
+		mes "Perhaps we can spar";
+		mes "together sometime.";
 		close;
 	}
 }
 
-einbroch,184,194,3	script	Suspicious Guy#nin	881,{
-
-	if(Class == Job_Ninja)
-	{
-		mes "[Crimson Panther Joe]";
-		mes "Oh, I see you've become a Ninja";
-		mes "There will be many hardships in the future, so don't slack off in training.";
-		close;
-	}
-	else if(!NINJ_Q)
-	{
-		mes "[Suspicious Guy]";
-		mes "Hyaa~ This sure is a high spot.";
-		mes "I've been to many different lands, but this is the highest place I've found so far.";
-		mes "My only regret is that I can't spend more time looking around this spectacular view...";
+que_ng,30,65,3	script	Cougar#nq	730,{
+	if (Upper == 2) {
+		mes "[Cougar]";
+		mes "I... I've never";
+		mes "seen a baby as";
+		mes "powerful as you!";
+		mes "G-get away, you";
+		mes "freak of nature!";
 		close;
 	}
-	switch(NINJ_Q)
-	{
-		case 1:
-			mes "[Suspicious Guy]";
-			mes "Hiyaa~ This sure is a high place, right?";
-			mes "I've traveled to many countries, but this is the first time I've seen such a tall building.";
-			next;
-			mes "[Suspicious Guy]";
-			mes "The air is clean, the town is quiet, and all the houses are short and cozy where I come from.";
-			next;
+	if (Class == Job_Novice) {
+		if (JobLevel < 10) {
+			mes "[Cougar]";
+			mes "Hm? Have you come to";
+			mes "learn how to be a Ninja?";
+			mes "You're not quite experienced";
+			mes "enough yet, so come back";
+			mes "after you're more familiar";
+			mes "with fighting monsters.";
+			close;
+		}
+		if (NINJ_Q == 0) {
 			mes "["+strcharinfo(0)+"]";
-			mes "Ah! No way!";
-			mes "Amatsu?!!!";
+			mes "Excuse me.";
+			mes "H-hello?";
 			next;
-			mes "[Suspicious Guy]";
-			mes "Nope.";
-			mes "....";
+			mes "[Cougar]";
+			mes "...............................";
+			mes "How did you do that?";
 			next;
 			mes "["+strcharinfo(0)+"]";
-			mes "Hmm~";
-			mes "Not Amatsu...";
-			mes "Then are you from Izlude?";
-			next;
-			mes "[Suspicious Guy]";
-			mes "Yes, that's correct.";
-			mes "I'm from Izlude.";
+			mes "Do what? I didn't";
+			mes "do anything, I don't think...";
 			next;
-			mes "[Suspicious Guy]";
-			mes "Due to personal reasons, I'm temporarily visiting this resource-rich country.";
+			mes "[Cougar]";
+			mes "H-How are you able to";
+			mes "see me? I'm supposed to";
+			mes "be invisible to the naked eye.";
+			mes "Ah, now I get it. Wildcat Joe";
+			mes "must have sent you to kill me! I won't fall for your tricks! Die!";
 			next;
 			mes "["+strcharinfo(0)+"]";
-			mes "I see...";
-			mes "Oh, do you happen to know a person named Field Cat Joe?";
-			mes "He's a Ninja from Amatsu";
-			mes "I need to find him.";
-			next;
-			mes "[Suspicious Guy]";
-			mes "I don't know. I've never heard of such a name.";
-			mes "I guess you must have some important reason why you must meet that person.";
+			mes "W-wait! I-I don't even";
+			mes "know who Wildcat Joe is!";
+			mes "Calm down, there's no";
+			mes "need to get violent!";
+			next;
+			mes "[Cougar]";
+			mes "What...?";
+			mes "How did you dodge";
+			mes "all of my attacks?";
+			mes "You've got some talent,";
+			mes "I'll give you that.";
 			next;
 			mes "["+strcharinfo(0)+"]";
-			mes "Yes. I have to deliver this letter to him so that I may become a Ninja too.";
-			next;
-			mes "[Suspicious Guy]";
-			mes "Hmm... Judging by your clothes, I see you're a traveler too.";
-			next;
-			mes "[Suspicious Guy]";
-			mes "Come to think of it, you may be able to find the person you are looking for.";
-			next;
-			mes "[Suspicious Guy]";
-			mes "I think I may have met him once in this village.";
-			next;
-			mes "[Suspicious Guy]";
-			mes "I'd like to help you find him together, but I still have some things to do first...";
-			next;
-			mes "[Suspicious Guy]";
-			mes "If you help me out with what I'm doing, then I will search for Crimson Panther Joe with you.";
-			next;
-			switch( select( "I'll just search for him alone.","Ok, I'll help you." ) )
-			{
-				case 1:
-					mes "[Suspicious Guy]";
-					mes "Ah, I understand.";
-					mes "Good luck looking for him. If you need help later, come and talk to me before I leave...";
-					close;
-
-				case 2:
-					mes "[Suspicious Guy]";
-					mes "Hmm.. Let's see.";
-					mes "I've come here to gather some raw materials so that I may create something I need.";
-					next;
-					mes "[Suspicious Guy]";
-					mes "I will be seeking the materials I need too, but I'm always running short in raw materials.";
-					mes "I'd be grateful if you could find me 1 Phracon and 5 Cyfar.";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "- Let's go find 1 Phracon and 5 Cyfar.-";
-					set NINJ_Q,2;
-					close;
-			}
-
-		case 2:
-			if(countitem(1010) < 1 || countitem(7053) < 5){
-				mes "[Suspicious Guy]";
-				mes "I asked for 1 Phracon and 5 Cyfar.";
-				mes "It looks like you didn't gather the amount I've requested.";
-				mes "I don't need it immediately, but I'd appreciate it if you could get those items for me.";
-				close;
+			mes "...............................";
+			mes "I came here hoping";
+			mes "to change my job";
+			mes "to a Ninja.";
+			next;
+			mes "[Cougar]";
+			mes "...Oh. Is that all?";
+			mes "Hmm, you've got great";
+			mes "potential, but I can't help";
+			mes "you now. I've got too many";
+			mes "enemies, and I can't let my";
+			mes "guard down for even a second.";
+			next;
+			mes "[Cougar]";
+			mes "That Wildcat Joe is";
+			mes "completely ruthless...!";
+			mes "He could strike at any time!";
+			mes "He'll do anything to achieve";
+			mes "victory over his enemies!";
+			next;
+			mes "[Cougar]";
+			mes "Wait, wait, I just";
+			mes "thought of something.";
+			mes "Maybe you can help me out.";
+			mes "Do what I ask, and I'll teach";
+			mes "you a few of my skills if you";
+			mes "really want to be a Ninja.";
+			next;
+			if(select("Sure.:No, thanks.") == 2) {
+				mes "[Cougar]";
+				mes "Hm? Well, alright.";
+				mes "Still, I don't see";
+				mes "why we can't help";
+				mes "each other in this";
+				mes "little predicament...";
+				close;	
 			}
-			mes "[Suspicious Guy]";
-			mes "I see you've accurately brought back what I need.";
-			mes "Hmm... Very well.";
-			mes "You've brought me the things I need, so I will not help you. Hmm...";
-			next;
-			mes "[Suspicious Guy]";
-			mes "Let's see that letter.";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "?????!!";
-			next;
-			mes "[Suspicious Guy]";
-			mes "Hmm? Are you perhaps here because Gai sent you here?";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Gasp... Then you're Field Cat...";
-			next;
-			mes "[Suspicious Guy]";
-			mes "Nope.";
-			mes "I'm not Field Cat Joe, but Crimson Panther Joe.";
-			mes "The only person who teases me as 'Field Cat' is Gai. Haha.";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Sigh... Is that how it is?";
-			next;
-			mes "[Crimson Panther Joe]";
-			mes "If you want to become a Ninja, you can't just trust your eyes.";
-			next;
-			mes "[Crimson Panther Joe]";
-			mes "Very few Ninjas, if any, where the stereotypical outfits depicted in picture books. And even if they did, you'd be lucky to spot one.";
-			next;
-			mes "[Crimson Panther Joe]";
-			mes "Don't forget that as soon as you reveal your identity as a Ninja, your life is at stake.";
-			next;
-			mes "[Crimson Panther Joe]";
-			mes "Even who I've said I am or anything I've said so far could be false.";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Ok...";
-			mes "...........";
-			next;
-			mes "[Crimson Panther Joe]";
-			mes "Well, Let's see it -- that letter.";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Ah, Yes.";
-			mes "Here.";
-			mes "-Rustle, rustle -";
-			next;
-			mes "[Crimson Panther Joe]";
-			mes "Hmm~~ Let's see...";
-			mes "I was thinking it might be another one of Gai's childish challenge letters, but I see it's a letter requesting truce.";
-			next;
-			mes "[Crimson Panther Joe]";
-			mes "But there's no need for a truce for me...";
-			mes "Thanks to you, I've already acquired all the raw materials needed to create a Kunai. Haha~";
-			next;
-			mes "[Crimson Panther Joe]";
-			mes "I'll write you a reply, regardless. Seeing how you've acquired my raw materials so quickly, with a bit of a sharper eye, I believe you could become an excellent Ninja.";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes ".....";
-			next;
-			mes "[Crimson Panther Joe]";
-			mes "Wait a moment.";
-			mes "I'll write you a response to Gai's letter right now.";
-			mes "Hmm Hmm...";
-			mes "...Scribble... Scribble...";
-			next;
-			mes "[Crimson Panther Joe]";
-			mes "Here. Here it is.";
-			mes "You'll know what's written inside as soon as you show *him* the letter.";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "- You recieve the letter that Joe-";
-			mes "- has just now scribbled down -";
-			mes "- on paper.-";
-			next;
-			mes "[Crimson Panther Joe]";
-			mes "Well, you better get a move on.";
-			mes "If you want to become a Ninja.";
-			next;
-			mes "[Crimson Panther Joe]";
-			mes "And if you do become a Ninja, we may end up meet each other frequently.";
-			mes "I'll be looking forward to it.";
+			mes "[Cougar]";
+			mes "Great! Now, I wanted to";
+			mes "ask Wildcat Joe if he'd";
+			mes "agree to a temporary truce.";
+			mes "I'm aware that both of us";
+			mes "are out of weapons, so we";
+			mes "should get well equipped first.";
+			next;
+			mes "[Cougar]";
+			mes "Please take this letter,";
+			mes "and deliver it to Wildcat";
+			mes "Joe in Einbroch. He's a master";
+			mes "of disguise, so keep a careful";
+			mes "eye out for him. Ah, and look";
+			mes "for him in a high place.";
+			next;
+			mes "[Cougar]";
+			mes "Yeah, Wildcat Joe";
+			mes "always did have a thing";
+			mes "for hiding in high places.";
+			mes "Anyway, after you give him";
+			mes "the letter, come back and";
+			mes "let me know his answer.";
+			set NINJ_Q,1;
+			setquest 6015;
+			close;
+		}
+		else if(NINJ_Q == 1) {
+			mes "[Cougar]";
+			mes "Even if this task";
+			mes "isn't that urgent,";
+			mes "please hurry over to";
+			mes "Einbroch and deliver";
+			mes "my letter to Wildcat Joe.";
+			close;
+		}
+		else if(NINJ_Q == 2) {
+			mes "[Cougar]";
+			mes "Did you deliver that";
+			mes "letter to Wildcat Joe?";
+			mes "I still need to know his";
+			mes "response to my proposal";
+			mes "for a truce. Anyway, see";
+			mes "if you can needle him for it.";
+			close;
+		}
+		else if(NINJ_Q == 3) {
+			mes "[Cougar]";
+			mes "Ah, you've returned.";
+			mes "So did Wildcat Joe send";
+			mes "you back here with his";
+			mes "response? Great, great,";
+			mes "please let me read it.";
+			next;
+			mes "[Cougar]";
+			mes "What...?! How could he";
+			mes "reject my proposal for";
+			mes "a truce?! This can only";
+			mes "mean that he's made another";
+			mes "Kunai. Nuts! I have to catch";
+			mes "up to him, or I'm a goner!";
+			next;
+			mes "[Cougar]";
+			mes "Listen, you've got to help";
+			mes "me out again! I need you to";
+			mes "gather some materials so that";
+			mes "I can craft my own Kunai to fight Wildcat Joe. Then, I'll go ahead";
+			mes "and change your job to a Ninja.";
+			next;
+			mes "[Cougar]";
+			mes "All you need";
+			mes "to bring me is";
+			mes "^3355FF5 Cyfars^000000 and";
+			mes "^3355FF1 Phracon^000000.";
+			mes "Please get those";
+			mes "as quickly as you can!";
 			next;
 			mes "["+strcharinfo(0)+"]";
-			mes "Yes... Well, I better get going...";
-			next;
-			mes "[Crimson Panther Joe]";
-			mes "Ah, It would probably take you a considerably long time to reach Amatsu.";
-			mes "Allow me to send you, "+strcharinfo(0)+" to Amatsu.";
-			mes "We'll meet again..";
-			delitem 1010,1;
-			delitem 7053,5;
-			set NINJ_Q,3;
-			close2;
-			warp "amatsu",113,127;
-			end;
-
-		case 3:
-			mes "[Crimson Panther Joe]";
-			mes "Hmm, I don't know what happened, but it seems you've returned to me without reaching Gai first.";
-			next;
-			mes "[Crimson Panther Joe]";
-			mes "If you would like, I can send you to amatsu again.";
-			mes "I'll take you back to Amatsu.";
-			next;
-			switch( select( "No thanks.","Yes, please send me to Amatsu." ) )
-			{
-				case 1 :
-					mes "[Crimson Panther Joe]";
-					mes "Hmm, very well.";
-					mes "Decisions are best when decided yourself.";
-					close;
-
-				case 2:
-					mes "[Crimson Panther Joe]";
-					mes "Very well.";
-					mes "I will now send you to Amatsu.";
-					close2;
-					warp "amatsu",113,127;
-					end;
+			mes "Huh? That's funny,";
+			mes "Wildcat Joe actually";
+			mes "asked me to gather";
+			mes "those same materials.";
+			next;
+			mes "[Cougar]";
+			mes "Curses! Then that means...";
+			mes "You actually helped Joe";
+			mes "in crafting his Kunai! No!";
+			mes "I should have thought about";
+			mes "that earlier! Well, it's too";
+			mes "late now. Just h-hurry it up!";
+			set NINJ_Q,4;
+			changequest 6017,6018;
+			close;
+		}
+		else if(NINJ_Q == 4) {
+			if (countitem(7053) < 5 || countitem(1010) < 1) {
+				mes "[Cougar]";
+				mes "Hurry and bring";
+				mes "^3355FF5 Cyfars^000000 and";
+				mes "^3355FF1 Phracon^000000 to me,";
+				mes "so that I can craft";
+				mes "my own Kunai to use";
+				mes "against Wildcat Joe!";
+				close;
 			}
-
-		case 4:
-			mes "[Crimson Panther Joe]";
-			mes "Is Gai bothering you with a lot of bothersome tasks?";
-			mes "Don't give up -- it'll all come in handy during your training.";
+			if (Skillpoint != 0) {
+				mes "[Cougar]";
+				mes "Whoa, whoa...";
+				mes "You still have some";
+				mes "leftover Skill Points.";
+				mes "You'd better spend all";
+				mes "of them before you";
+				mes "change jobs, right?";
+				close;
+			}
+			mes "[Cougar]";
+			mes "Ah, you're back with";
+			mes "everything that I need.";
+			mes "You've come earlier than";
+			mes "I expected, eh? Great,";
+			mes "as promised, I'll turn";
+			mes "you into a Ninja.";
+			next;
+			mes "[Cougar]";
+			mes "Let me formally introduce";
+			mes "myself. I am High Ninja Cougar";
+			mes "in the Touga Ninja Corps, and";
+			mes "I'm in charge of the search";
+			mes "party to find Sir Kazma.";
+			next;
+			mes "[Cougar]";
+			mes "Sir Kazma is the chief";
+			mes "of my village, but he's";
+			mes "run away. This has resulted";
+			mes "in an internal conflict within";
+			mes "the Ninja Corps. Things are";
+			mes "pretty unstable right now...";
+			next;
+			mes "[Cougar]";
+			mes "I initially didn't want to";
+			mes "accept you as a Ninja because";
+			mes "of this complicated situation.";
+			mes "However, you've proven that";
+			mes "you're truly worthy of joining";
+			mes "the Ninja ranks.";
+			next;
+			mes "[Cougar]";
+			mes "According to his letter, even";
+			mes "Joe thinks highly of you. Just";
+			mes "remember that, as a Ninja, your";
+			mes "mission is your highest priority. But don't let mission objectives";
+			mes "supercede your conscience.";
+			next;
+			mes "[Cougar]";
+			mes "''Secrecy above all else.''";
+			mes "To keep our secrets in the";
+			mes "shadows, you can only buy";
+			mes "or sell Ninja weapons with";
+			mes "authorized dealers. Please";
+			mes "keep that in mind.";
+			next;
+			mes "[Cougar]";
+			mes "As of today, you are";
+			mes "now a proud member of the";
+			mes "Touga Ninja Corps. Be as";
+			mes "agile as the wind, and as";
+			mes "quiet as the falling shadows.";
+			callfunc "Job_Change",Job_Ninja;
+			set NINJ_Q,5;
+			getitem 13010,1;	// Asura
+			completequest 6018;
+			close;
+		}
+		else {
+			mes "[Cougar]";
+			mes "How have you been?";
+			mes "Train hard: you want";
+			mes "to be able to vanish";
+			mes "without a trace. If you";
+			mes "can do that, you'll get";
+			mes "the respect of any Ninja~";
 			close;
+		}
+	}else{
+		if (Class == Job_Ninja) {
+			mes "[Cougar]";
+			mes "How have you been?";
+			mes "Train hard: you want";
+			mes "to be able to vanish";
+			mes "without a trace. If you";
+			mes "can do that, you'll get";
+			mes "the respect of any Ninja~";
+			close;
+		}else{
+			mes "[Cougar]";
+			mes "What...?";
+			mes "How were you able";
+			mes "to find me hidden";
+			mes "in the shadows?!";
+			mes "You must be more than";
+			mes "a common adventurer, eh?";
+			close;
+		}
 	}
 }
+
+einbroch,184,194,3	script	Suspicious Man#nq	 	881,{
+	if (NINJ_Q == 1) {
+		mes "[Suspicious Man]";
+		mes "I've traveled to many";
+		mes "countries, but I've never";
+		mes "been on a building as high";
+		mes "as Einbroch Tower. All the";
+		mes "buildings in my hometown";
+		mes "are tiny in comparison...";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Oh, are you from";
+		mes "Amatsu? I'm looking";
+		mes "for someone named";
+		mes "Wildcat Joe from there.";
+		next;
+		mes "[Suspicious Man]";
+		mes "...No. No, I'm actually";
+		mes "from Izlude, and I'm only";
+		mes "here in Einbroch for some";
+		mes "minerals. Tell me, why are";
+		mes "you looking for this Wildcat Joe?";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Well, I need to deliver";
+		mes "this letter to him and";
+		mes "get his response so that";
+		mes "I can become a Ninja.";
+		next;
+		mes "[Suspicious Man]";
+		mes "Really? Now that I think";
+		mes "about it, I do think that I've";
+		mes "run once or twice into him";
+		mes "in this town. Though, he prefers to be called ''Red Leopard Joe,''";
+		mes "instead of ''Wildcat Joe.''";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "I really want to help you";
+		mes "find him, but first I need";
+		mes "to find the minerals that";
+		mes "I'm looking for. If you don't";
+		mes "mind, would you help me?";
+		mes "Then I can help you find Joe.";
+		next;
+		if(select("Don't worry, I'll find him alone.:Sure, I'll help you.") == 1) {
+			mes "[Suspicious Man]";
+			mes "You sure about that...?";
+			mes "Red Leopard Joe is a true";
+			mes "master of disguise. You'll";
+			mes "need all the help you can";
+			mes "get to find him...";
+			close;
+		}
+		mes "[Suspicious Man]";
+		mes "Great, I'm glad to";
+		mes "hear that. Please";
+		mes "help me find";
+		mes "^3355FF5 Cyfars^000000 and";
+		mes "^3355FF1 Phracon^000000.";
+		set NINJ_Q,2;
+		changequest 6015,6016;
+		close;
+	}
+	else if(NINJ_Q == 2) {
+		if (countitem(7053) < 5 || countitem(1010) < 1) {
+			mes "[Suspicious Man]";
+			mes "Please bring";
+			mes "^3355FF5 Cyfars^000000 and";
+			mes "^3355FF1 Phracon^000000 to me as";
+			mes "soon as you can. Then,";
+			mes "I can help you find";
+			mes "Red Leopard Joe.";
+			close;	
+		}
+		mes "[Suspicious Man]";
+		mes "Good, good. You've";
+		mes "brought the minerals...";
+		mes "Now, it's my turn to";
+		mes "help you now. Here,";
+		mes "let me see that letter.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "?????!!";
+		next;
+		mes "[Suspicious Man]";
+		mes "Why? Didn't you bring Cougar's letter for me?";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Are you...";
+		mes "Are you Wildcat Joe?";
+		next;
+		mes "[Suspicious Man]";
+		mes "...Yes, but I prefer to";
+		mes "be called Red Leopard Joe.";
+		mes "Cougar sent you to me, right?";
+		mes "He's the only one who calls";
+		mes "me that. So you want to be";
+		mes "a Ninja, eh? Hmm, alright.";
+		next;
+		mes "[Red Leopard Joe]";
+		mes "If you want to be a Ninja,";
+		mes "you should always be careful";
+		mes "of what you see and what you trust. Don't forget that if your";
+		mes "secrets are ever discovered, then you're finished as a Ninja.";
+		next;
+		mes "[Red Leopard Joe]";
+		mes "Remember to move";
+		mes "quickly, and to always";
+		mes "vanish without a trace.";
+		mes "To remain hidden in the";
+		mes "shadows is really our";
+		mes "ultimate power.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "I see...";
+		mes "...........";
+		next;
+		mes "[Red Leopard Joe]";
+		mes "For now, let me read";
+		mes "this letter. Let's see...";
+		mes "Hm. I thought that Cougar";
+		mes "would want to challenge me";
+		mes "again, but he actually wants";
+		mes "a temporary truce? Hah!";
+		next;
+		mes "[Red Leopard Joe]";
+		mes "Thanks to your help,";
+		mes "I now have the minerals";
+		mes "I need to construct a Kunai!";
+		mes "Hahaha! I won't agree to a truce when I have the advantage!";
+		next;
+		mes "[Red Leopard Joe]";
+		mes "Anyway, let me write my";
+		mes "response to him. I'll also";
+		mes "give you my recommendation...";
+		mes "I think you'll make a very fine";
+		mes "Ninja, even if I did trick you";
+		mes "just earlier. Heh heh heh!";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "......";
+		mes ".........";
+		mes "............";
+		next;
+		mes "[Red Leopard Joe]";
+		mes "Here you go.";
+		mes "Please bring this";
+		mes "letter to Cougar.";
+		mes "It'll take a while to";
+		mes "return to Amatsu, so let";
+		mes "me send you there directly...";
+		delitem 1010,1;	// Phracon
+		delitem 7053,5;	// Cyfar
+		set NINJ_Q,3;
+		changequest 6016,6017;
+		close2;
+		warp "amatsu",113,127;
+		end;
+	}
+	else if(NINJ_Q == 3) {
+		mes "[Red Leopard Joe]";
+		mes "Eh? I'm not sure what";
+		mes "happened, but it seems";
+		mes "that you haven't delivered";
+		mes "my response to Cougar yet.";
+		mes "Shall I directly send you";
+		mes "to Amatsu right now?";
+		next;
+		if(select("No, thanks.:Yes, please.") == 1) {
+			mes "[Red Leopard Joe]";
+			mes "Alright. Well, I was";
+			mes "just trying to save";
+			mes "you some time.";
+			close;
+		}
+		mes "[Red Leopard Joe]";
+		mes "Okay, then.";
+		mes "Goodbye for now.";
+		close2;
+		warp "amatsu",113,127;
+		end;
+	}
+	else if(NINJ_Q == 4) {
+		mes "[Red Leopard Joe]";
+		mes "Cougar asked you to";
+		mes "gather some materials";
+		mes "too? Oh well, I suppose";
+		mes "that I can't blame him.";
+		mes "Besides, I should be able";
+		mes "to beat him in a fair fight~";
+		close;
+	}
+	else if(NINJ_Q == 5 && Class == Job_Ninja) {
+		mes "[Red Leopard Joe]";
+		mes "Oh, you're a Ninja~";
+		mes "I hope you continue to";
+		mes "train yourself and master";
+		mes "all the Ninja skills that";
+		mes "you can. Always remember";
+		mes "to blend into the shadows.";
+		close;
+	}
+	else {
+		mes "[Tourist]";
+		mes "I've traveled to many";
+		mes "countries, but I've never";
+		mes "been on a building as high";
+		mes "as Einbroch Tower. All the";
+		mes "buildings in my hometown";
+		mes "are tiny in comparison...";
+		close;
+	}
+}
\ No newline at end of file
diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt
index 3c9064193..1a099ef2c 100644
--- a/npc/jobs/1-1e/taekwon.txt
+++ b/npc/jobs/1-1e/taekwon.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Tsuyuki & Samuray22
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= eAthena/Freya
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //= 1.0 Replaced previous TK Job Quest with this one [Tsuyuki]
 //= 1.1 Rewrote to the Aegis Standars. [Samuray22]
 //= 1.2 Fixed position the npc is facing. [Kisuka]
+//= 1.3 Added Quest Log commands. [Kisuka]
 //============================================================ 
 
 
@@ -106,6 +107,7 @@ L_change:
 				mes "spiritual training. Take a deep";
 				mes "breath, speak to me when ready.";
 				set TK_Q, 2;
+				setquest 6001;
 				close;
 			}
 			mes "[Phoenix]";
@@ -116,6 +118,7 @@ L_change:
 			next;
 			set TAEK_Q, BaseLevel;
 			set TK_Q, 1;
+			setquest 6000;
 			mes "[Phoenix]";
 			mes "I understand this is not an";
 			mes "easy task for Novices, but you";
@@ -138,6 +141,7 @@ L_change:
 	case 1:
 		if(BaseLevel > TAEK_Q) {
 			set TK_Q, 2;
+			changequest 6000,6001;
 			mes "[Phoenix]";
 			mes "Good. I sense that you";
 			mes "are more in tune with your";
@@ -176,6 +180,30 @@ L_change:
 		mes "you generally respond?";
 		next;
 		switch(select( "I face it head on.:Avoid it somehow.:Regroup and analyze the problem.")) {
+		case 1:
+			mes "[Phoenix]";
+			mes "Yes, that is the answer";
+			mes "I wanted. Even if you cannot";
+			mes "handle a problem at first, we";
+			mes "can only benefit from such";
+			mes "strong determination. Don't";
+			mes "let any obstacle stop you.";
+			next;
+			mes "[Phoenix]";
+			mes "Even if you fail, you";
+			mes "can only learn from the";
+			mes "experience when you give";
+			mes "your all. Half-hearted";
+			mes "attempts rarely yield";
+			mes "fruitful results.";
+			next;
+			mes "[Phoenix]";
+			mes "Seeing as you already";
+			mes "understand the importance";
+			mes "of one's will, we'll proceed";
+			mes "to the next question.";
+			next;
+			break;
 		case 2:
 			mes "[Phoenix]";
 			mes "Fool! How do you expect";
@@ -210,29 +238,6 @@ L_change:
 			mes "as well as what you define as";
 			mes "failure. Then, return to me.";
 			close;
-		case 1:
-			mes "[Phoenix]";
-			mes "Yes, that is the answer";
-			mes "I wanted. Even if you cannot";
-			mes "handle a problem at first, we";
-			mes "can only benefit from such";
-			mes "strong determination. Don't";
-			mes "let any obstacle stop you.";
-			next;
-			mes "[Phoenix]";
-			mes "Even if you fail, you";
-			mes "can only learn from the";
-			mes "experience when you give";
-			mes "your all. Half-hearted";
-			mes "attempts rarely yield";
-			mes "fruitful results.";
-			next;
-			mes "[Phoenix]";
-			mes "Seeing as you already";
-			mes "understand the importance";
-			mes "of one's will, we'll proceed";
-			mes "to the next question.";
-			next;
 		}
 		mes "[Phoenix]";
 		mes "On your travels, you will";
@@ -331,6 +336,7 @@ L_change:
 		mes "while. When your mind is calm,";
 		mes "come and speak to me.";
 		set TK_Q, 3;
+		changequest 6001,6002;
 		close;
 	case 3:
 		mes "[Phoenix]";
@@ -369,6 +375,7 @@ L_change:
 			mes "shirk your training, or bring";
 			mes "shame to Taekwon Do.";
 			next;
+			completequest 6002;
 			callfunc "Job_Change",Job_Taekwon;
 			callfunc "F_ClearJobVar";
 			getitem 2101,1; // Guard[0]