Updated several ancient headgear quests.

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

9 files changed, 1702 insertions, 1289 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index ff99fca15..7d3ce25ae 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
-2008/08/31
+2008/08/3.
+	* Rev. 13163 Updated several ancient headgear quests. [L0ne_W0lf]
 	* Rev. 13154 Missed one of those blatant errors in the Keil Hyre Quest. [L0ne_W0lf]
 	* Rev. 13154 Fixed blatant errors that I added to Keil Hyre Quest. [L0ne_W0lf]
 2008/08/29
diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index 362761ab8..be932749b 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 2.2
+//= 2.3
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -28,7 +28,8 @@
 //= 2.0 Turtle Island quest now clears TURTLE var and set 
 //= MISC_QUEST bit (MISC_QUEST & 65536) [Lupus]
 //= 2.1 Added missing close. [L0ne_W0lf]
-//= 2.2 Updated Gotan to be compliant with misc_quiest var. [L0ne_W0lf
+//= 2.2 Updated Gotan to be compliant with misc_quiest var. [L0ne_W0lf]
+//= 2.3 Updated heardgear Quest NPCs. [L0ne_W0lf]
 //============================================================ 
 
 
@@ -47,7 +48,7 @@ alberta,117,135,0	script	Elin	96,{
 		mes "then come see me again";
 		close;
 	}
-		mes "[Elin]";
+	mes "[Elin]";
 	if (Sex == 1) {
 		mes "Hello~!";
 		mes "Heh heh, you're a boy, so you";
@@ -400,435 +401,561 @@ alberta,117,135,0	script	Elin	96,{
 //=======================================================================================================//
 alberta_in,28,145,4	script	Grampa	120,{
 	mes "[Grampa]";
-	mes "Gasp ..Gasp";
-	next;
-	mes "[Grampa]";
-	mes "When I look back on my younger days... I regret not making better use of my time...";
+	mes "*Gasp*...";
+	mes "....*Gasp!*";
+	mes "Oh...";
+	mes "Some may say I've lived a full life on wine, women and song...";
 	next;
 	mes "[Grampa]";
-	mes "Even so I STILL feel young at heart..... unfortunately my body is very old and is in poor condtion...... Cough !! Cough .. !!";
+	mes "But my soul still burns with youthful vigor! It's just... This old body can't keep up anymore... *Hack! Wheeeeze~*";
 	next;
-	if(countitem(1030) >= 10) menu "Talk.",M_Talk, "Show him Tiger's Footskin.",M_Show, "Cancel.",M_End;
-	menu "Talk",M_Talk, "Cancel",M_End;
-	
-	M_Talk:
-		mes "[Grampa]";
-		mes "Listen to me..... You must take care of your body as best you can....";
-		mes "If you aren't serious about staying healthy now..... you will surely regret it as you get older.";
-		next;
-		mes "[Grampa]";
-		mes "I've tried to restore my body to its youthful, healthy state with all of the best herbs and medicines that money can buy....";
-		next;
-		mes "[Grampa]";
-		mes "Not only have none of them worked, but their emense cost have made me bankurpt!";
-		next;
-		mes "[Grampa]";
-		mes "I have all but given up on trying to restore my youth.... there IS still one last thing I have not yet tried.....";
-		next;
-		mes "[Grampa]";
-		mes "It is the ^3355FFTiger's Footskin^000000, the legendary king of rejuvination!!"; 
-		emotion e_gasp;
-		next;
-		mes "[Grampa]";
-		mes "Have you heard of the Tiger's Footskin???.....";
-		emotion e_what;
-		next;
-		mes "[Grampa]";
-		mes "Just by LOOKING at it, your white hair turns Black again! By SMELLING it, your reflexes become 10x faster!";
-		mes "And just a single TASTE can turn and 80 year old man.... INTO AN 18 BOY!!!!";
-		next;
-		mes "[Grampa]";
-		mes "It truely is amazing! Ah, if I could only get my hands on some Tiger's Footskin.... my wishes would at last come true.....";
-		next;
-		mes "[Grampa]";
-		mes "For whoever brings me ^5555FF10 Tiger's Footskins^000000, I would gladly give that person my precious ^3355FFBoys Cap^000000.";
-		close;
-
-	M_Show:
-		mes "[Grampa]";
-		mes "Ohhh !! Th-This is the... this is the legendary.... TIGERS FOOTSKIN!!";
-		next;
-		mes "[Grampa]";
-		mes "Just by LOOKING at it, your white hair turns Black again! By SMELLING it, your reflexes become 10x faster!";
-		mes "And just a single TASTE can turn and 80 year old man.... INTO AN 18 BOY!!!!";
-		next;
-		mes "[Grampa]";
-		mes "It is the real Tiger's Footskin !! In my wildest dreams I never thought...... P-P-Please.... I beg you.... let me have it.....";
-		next;
-		menu "-Give him the Tiger's Footskin.",-, "Walk away.", sM_End;
-
+	if (countitem(1030) > 9) {
+		switch(select("Show him Tiger's Footskin.:Exchange it with Boys Cap.:Cancel")) {
+		case 1:
+			mes "[Grampa]";
+			mes "Ohhh~ !!";
+			mes "Is that...?";
+			mes "It is! ";
+			mes "That's Tiger's Footskin!! Even from here I can feel its powers!";
+			next;
 			mes "[Grampa]";
-			if(countitem(1030) < 10) goto L_NoItems;
-			delitem 1030,10;
-			getitem 5016,1;
-			mes "T-Thank YOU!! Thank you SO VERY MUCH!!";
-			emotion e_thx;
+			mes "One glance at it can restore your strength, one sniff and your blood boils with vigorous pleasure...";
 			next;
 			mes "[Grampa]";
-			mes "Now my body can be reinvigorated!!! I will eat it right away!";
+			mes "Just one bite...";
+			mes "Will revive my virility!!!! The Tiger's Footskin~!! Ohhhh! Ohh My God !! Please!!! Please give me that... Please...";
 			close;
-
-		L_NoItems:
-			mes "Get off damn cheater!!!";
-			emotion e_bzz;
+		case 2:
+			delitem 1030,10;  //Tiger_Footskin
+			getitem 5016,1; //Boy's_Cap
+			mes "[Grampa]";
+			mes "T... Thank you !!";
+			mes "With this I can revive my youthful splendor!! I must eat this thing right away !";
+			next;
+			mes "[Grampa]";
+			mes "...";
+			mes "Nope. Still feel OLD.";
+			mes "If anything, I feel even worse. Th-there's this buzzing in my head...";
 			close;
-
-		sM_End:
+		case 3:
 			mes "[Grampa]";
-			mes "H-He-Hey!! Young one!! W-Wa-it! Please.... come back... I beg you.... come... back.... ooohh... foot.... sk... i... n....";
+			mes "He...Hey, kid !! W-Wait !";
 			close;
-
-	M_End:
-		mes "[Grampa]";
-		mes "Cough Cough !! .. Tiger ....Tiger's ..... Foot ..... skin .....Cough Cough !!";
-		close;
-
-
+		}
+	} 
+	else {
+		switch(select("Talk:Cancel")) {
+		case 1:
+			mes "[Grampa]";
+			mes "Listen well...";
+			mes "You've got to take care of yourself as well as your can. Without your health, one cannot enjoy the pleasures of this mortal realm.";
+			next;
+			mes "[Grampa]";
+			mes "In order to restore my youth, I tried all sorts of things, mostly by hearsay, but nothing worked. In the end, I spent so much zeny on miracle cures, I ended up broke.";
+			next;
+			mes "[Grampa]";
+			mes "I've mostly given up on restoring my youth. But there is one hope left... Eating ^3355FFTiger's Footskin^000000, The King of Invigorators!!";
+			next;
+			mes "[Grampa]";
+			mes "Haven't you heard?! One glance would restore the color in my white hair, one sniff, even just one touch, and an 80 year-old would have another chance at youth... It's The King of Invigorators !";
+			next;
+			mes "[Grampa]";
+			mes "Before I die...";
+			mes "I wish I could eat 10 Tiger's Footskin. Then, I wouldn't have to die!";
+			next;
+			mes "[Grampa]";
+			mes "If someone helped me get them, I would give that person my precious item, ^3355FFBoys Cap^000000 without regret...";
+			close;
+		case 2:
+			mes "[Grampa]";
+			mes "Cough Cough !!";
+			mes "Tiger ....Tiger's ..... Foot ..... skin .....Cough Cough !!";
+			close;
+		}
+	}
 }
 
-
 //=======================================================================================================//
 //						Antlers Quest 
 //=======================================================================================================//
 alberta_in,122,53,4	script	Cherokee	47,{
 	mes "[Cherokee]";
-	mes "Hey there, I am a Horn Collector.  Sounds great, huh?";
+	mes "Hey there~!";
 	next;
 	mes "[Cherokee]";
-	mes "What do you think about Animal horns? I think they are very valuable and are well worth collecting.";
-	mes "You can wear them on your head, or even decorate your house with them.";
+	mes "What do you think about animal horns? Oh man, I think they're great! Don't you? I love animal horns so much I became a ^3355FFHorn Collector^000000.";
 	next;
 	mes "[Cherokee]";
-	mes "You know.... there has been a particular horn that I have not been able to find.  It is the ^5555FF'Evil Horn '^000000..";
+	mes "I mean, there's so many things you can do with horns. You can wear them on your head, you can wear them on, um... your house? All sorts of things!";
 	next;
 	mes "[Cherokee]";
-	mes "Some say that an Evil Horn is really not an animal's horn, but one that comes from a Devil!";
-	mes "Even so, I really wish I could get my hands on one.";
+	mes "I've collected almost every sort of horn except for one kind, and that's ^FF3355Evil Horn^000000. Some people say Evil Horn doesn't even come from an animal, but from a demon. But even so, I still want it.";
 	next;
 	mes "[Cherokee]";
-	mes "Say.... do you have any ^5555FF'Evil Horns'^000000?";
-	mes "If you offer me ^5533FF20 Evil Horns^000000, I will give you my precious and famed, ^FF3355'Antlers'^000000.  Is it a deal?";
+	mes "Do you...";
+	mes "Do you have ^FF3355Evil Horn^000000?";
+	mes "If you offer me 20 Evil Horns, I will give you an ^3355FFAntler^000000 from my precious collection. So, deal?";
 	next;
-	menu "You got it!",-, "Shut up Dumbo.",M_End;
-
-		mes "[Cherokee]";
-		if(countitem(923) < 20) goto L_NotEnuf;
-		delitem 923,20;
-		mes "Whoah~! This is the first time I've ever seen a real ^3355FF'Evil Horn'^000000!!";
-		emotion e_ic;
-		next;
-		mes "[Cherokee]";
-		mes "Thank you! Here are the Antlers just as I promised you!";
-		emotion e_thx;
-		getitem 2284,1;
-		next;
-		mes "[Cherokee]";
-		mes "With your great help I was finally able to realize my long time dream.  I appreciate what you have done! God Bless You ..";
-		close;
-
-		L_NotEnuf:
-			mes "Hmm.... like I said, I need ^FF5533'20 Evil Horns'^000000.";
+	switch(select("Okay, let's deal.:Shut up, Dumbo.")) {
+	case 1:
+		if (countitem(923) > 19) {
+			delitem 923,20;  //Evil_Horn
+			mes "[Cherokee]";
+			mes "Whoah~! This is the first time I've ever seen a real ^FF3355Evil Horn^000000!!";
+			mes "Thank you! Here, this is my Antler for you!";
+			getitem 2284,1; // Antler
+			next;
+			mes "[Cherokee]";
+			mes "With your great help, I can make my wish come true this time. Finally, I'll be recognized as a serious horn collector. I appreciate this~!";
 			close;
-
-	M_End:
+		}
+		else {
+			mes "[Cherokee]";
+			mes "Hmm...";
+			mes "You don't seem to have enough. I need ^FF335520 Evil Horns^000000 for my collection.";
+			close;
+		}
+	case 2:
 		mes "[Cherokee]";
-		mes "Well aren't you a rude person.... I will forgive you however, seeing as we will meet again, I'm sure....";
+		mes "Well that's fine. Although you're a rude prick, I will forgive you. We'll probably speak again...";
 		close;
+	}
 }
 
-
 //=======================================================================================================//
 //			Bao Bao, Cresent Hairpin, Fashionbale Glasses, Heart Hairpin
 //=======================================================================================================//
-alberta,120,53,3	script	Zic	51,{
-	mes "[Zic]";
-	mes "Yay! A cool breeze! That's why I love the sea!!";
-	emotion e_ho;
-	next;
-	mes "[Zic]";
-	mes "Huh?... Do you have any business with me? You came to me because I'm a merchant right?";
-	emotion e_hmm;
-	next;
-	mes "[Zic]";
-	mes "~Sigh!~ I get tired of my reputation.... I can't get any peace or quite around here.....";
-	next;
-	mes "[Zic]";
-	mes "So what do you wanna get? Tell me, tell me! It's so easy to guess what you want.....";
-	next;
-	menu "-Bao Bao",-, "-Cresent Hairpin",M_1, "-Fashionable Glasses",M_2, "-Heart Hairpin",M_3;
-
+alberta,120,53,1	script	Stylish Merchant#new30	51,{
+	if ((countitem(10007) > 0) && (countitem(968) > 49)) {
 		mes "[Zic]";
-		mes "To make a Bao Bao I will need:";	//5042
-		mes "- ^5555FF1 Silk Ribbon^000000,";	//10007
-		mes "- ^5555FF50 Herioc Emblems^000000.";	//968
+		mes "I know I know, you just want to get a Bao Bao of your own. But I can't concentrate on my work if you keep rushing me like this.";
+		next;
+		mes "^3355FF*Thud! Thud!*";
+		mes "*Ah! Kek! Smash!*";
+		mes "*Boom Boom!*^000000";
 		next;
+		delitem 10007,1;  //Silk_Ribbon
+		delitem 968,50;  //Voucher_Of_Orcish_Hero
+		mes "[Zic]";
+		mes "Phew!";
+		mes "There you go~!";
+		mes "Now make good use of it!!";
+		getitem 5042,1; // Hair_Protector
+		close;
+	}
+	else if((countitem(5041) > 0) && (countitem(999) > 9)) {
 		mes "[Zic]";
-		mes "Would you like me to make you one?";
+		mes "Alright alright! Gosh, your Crescent Hairpin will be ready in a bit, but I can't concentrate my work if you keep rushing me like this!";
 		next;
-		menu "Sure.",-, "No thanks.",M_End;
-
-			if (countitem(10007)<1 || countitem(968)<50) goto sL_NotEnuf;
-			delitem 10007, 1;
-			delitem 968, 50;
-			mes "[Zic]";
-			mes "Please wait while I make your Bao Bao......";
-			next;
-			mes "[Zic]";
-			mes "There you are, one Bao Bao.  Enjoy.";
-			getitem 5042, 1;
-			close;
-	M_1:
+		mes "^3355FF*Thud! Thud!*";
+		mes "*Ah! Kek! Smash!*";
+		mes "*Boom Boom!*^000000";
+		next;
+		delitem 5041,1;  //Heart_Hair_Pin
+		delitem 999,10;  //Steel
 		mes "[Zic]";
-		mes "To make a Cresent Hairpin I will need:";	//5048
-		mes "- ^5555FF1 Heart Hair Pin^000000,";	//5041
-		mes "- ^5555FF10 Steel^000000.";	//999
+		mes "Phew!";
+		mes "It's done~!";
+		mes "Now wear it and";
+		mes "look pretty or";
+		mes "something, yeah?";
+		getitem 5048,1; // First_Moon_Hair_Pin
+		close;
+	}
+	else if((countitem(2271) > 0) && (countitem(975) > 0)) {
+		mes "[Zic]";
+		mes "Yeah yeah, you came for your Fashionable Glasses. Just don't rush me, or I won't be able to concentrate on my work, alright?";
 		next;
+		mes "^3355FF*Thud! Thud!*";
+		mes "*Ah! Kek! Smash!*";
+		mes "*Boom Boom!*^000000";
+		next;
+		delitem 2271,1;  //Jack_A_Dandy
+		delitem 975,1;  //Scarlet_Dyestuffs
 		mes "[Zic]";
-		mes "Would you like me to make you one?";
+		mes "Phew, it's done!";
+		mes "Now go wear these and look, well, as fashionable as these glasses, I guess.";
+		getitem 5047,1; // Fashion_Sunglass
+		close;
+	}
+	else if(countitem(7013) > 1199){
+		mes "[Zic]";
+		mes "Okay okay, you want your Heart hairpin, I'm working on it. Yeesh, I can't concentrate at all if you try to rush me, you know?";
 		next;
-		menu "Sure.",-, "No thanks.",M_End;
-
-			if (countitem(5041)<1 || countitem(999)<10) goto sL_NotEnuf;
-			delitem 5041, 1;
-			delitem 999, 10;
-			mes "[Zic]";
-			mes "Please wait while I make your Cresent Hairpin......";
-			next;
-			mes "[Zic]";
-			mes "There you are, one Cresent Hairpin.  Enjoy.";
-			getitem 5048, 1;
-			close;
-	M_2:
+		mes "^3355FF*Thud! Thud!*";
+		mes "*Ah! Kek! Smash!*";
+		mes "*Boom Boom!*^000000";
+		next;
+		delitem 7013,1200;  //Coral_Reef
+		mes "[Zic]";
+		mes "Phew~!";
+		mes "Finally, it's done!";
+		mes "Make me happy and";
+		mes "wear it with pride~";
+		getitem 5041,1; // Heart_Hair_Pin
+		close;
+	}
+	else {
 		mes "[Zic]";
-		mes "To make a pair of Fashionable Glasses I will need:";	//5047
-		mes "- ^5555FF1 Jack a Dandy^000000,";	//2271
-		mes "- ^5555FF1 Scarlet Dyestuffs^000000.";	//975
+		mes "Yay, this cool";
+		mes "breeze is great!";
+		mes "I love the sea!";
 		next;
 		mes "[Zic]";
-		mes "Would you like me to make you one?";
+		mes "...Hm?";
+		mes "Awww man. Can't you tell I'm on vacation? All I wanted was some peaceful rest.";
 		next;
-		menu "Sure.",-, "No thanks.",M_End;
-
-			if (countitem(2271)<1 || countitem(975)<1) goto sL_NotEnuf;
-			delitem 2271, 1;
-			delitem 975, 1;
-			mes "[Zic]";
-			mes "Please wait while I make your Fashionable Glasses......";
-			next;
-			mes "[Zic]";
-			mes "There you are, one Fashionable Glasses.  Enjoy.";
-			getitem 5047, 1;
-			close;
-	M_3:
 		mes "[Zic]";
-		mes "Are you sure you want a simple item like this? Oh well... To make a Heart Hairpin I will need:";	//5041
-		mes "- ^5555FF1200 Coral Reefs^000000.";	//7013
-		emotion e_hmm;
+		mes "Okay okay, you win. Once again, my reputation as a master craftsman precedes me.";
 		next;
 		mes "[Zic]";
-		mes "Would you like me to make you one?";
+		mes "Let me know what item you're interested in, and maybe I'll make it for you...";
 		next;
-		menu "Sure.",-, "No thanks.",M_End;
-
-			if (countitem(7013)<1200) goto sL_NotEnuf;
-			delitem 7013, 1200;
+		switch(select("Bao Bao:Cresent Hairpin:Fashionable Glasses:Heart Hairpin")) {
+		case 1:
 			mes "[Zic]";
-			mes "Please wait while I make your Hear Hairpin......";
+			mes "Sooo...";
+			mes "You want me to make you a Bao Bao, huh? Alright, alright...";
 			next;
 			mes "[Zic]";
-			mes "There you are, one Heart Hairpin.  Enjoy.";
-			getitem 5041, 1;
+			mes "Let's see, I'll need...";
+			mes "1 ^0000FFSilk Ribbon^000000";
+			mes "50 ^0000FFHeroic Emlbem^000000";
+			mes "...Did you know this already?";
 			close;
-
-		sL_NotEnuf:
+		case 2:
 			mes "[Zic]";
-			mes "Hmm.... you don't have enough items for me to make it.  Come back some other time.";
+			mes "So you want a Crescent Hairpin, huh? Man, I guess these things are pretty high in demand.";
+			next;
+			mes "[Zic]";
+			mes "Okay, I'll need...";
+			mes "1 ^0000FFHeart hair pin^000000";
+			mes "10 ^0000FFSteel^000000";
+			mes "...Did you know this already?";
 			close;
-
-	M_End:
-		mes "[Zic]";
-		mes "See ya around.";
-		close;
+		case 3:
+			mes "[Zic]";
+			mes "Weird. How'd you know I make Fashionable Glasses? I guess I must be more famous that I thought.";
+			next;
+			mes "[Zic]";
+			mes "I need to have...";
+			mes "1 ^0000FFJack a Dandy^000000";
+			mes "1 ^0000FFScarlet Dyestuffs^000000";
+			mes "...Did you know this already?";
+			close;
+		case 4:
+			mes "[Zic]";
+			mes "You want a heart hairpin, eh? Okay, I think I can work something out for you...";
+			next;
+			mes "[Zic]";
+			mes "Just gimmie...";
+			mes "2300 ^0000FFCoral Reef^000000.";
+			mes "...Did you know this already?";
+			close;
+		}
+	}
 }
 
-
 //=======================================================================================================//
 //				Hat of Sun God, Sunday Hat, Mage Hat, Magician Hat
 //=======================================================================================================//
-alberta,135,79,3	script	Tempestra	71,{
+alberta,136,79,1	script	Hat store girl#new30	71,{
 	mes "[Tempestra]";
-	mes "Ah...... Such a cool breeze.  It's good to be next to the sea.  I think it was the right choice for me to take a break from my business and come here.";
-	emotion e_ho;
-	if(MISC_QUEST & 2) goto sM_Menu;
+	mes "Ah, such a cool breeze. It's good to visit the seashore. I think it was the right choice to come here to take a break from my business.";
 	next;
 	mes "[Tempestra]";
-	mes "Oh the sun is so bright today.  I'm glad I brought my hat.  If my skin is exposed to the sun like this everyday, I'm sure to get a sunburn.";
+	mes "Ooh, the sun is too strong today. I'm glad that I brought my hat. I'm going to get a sunburn if my skin is exposed to the sun like this everyday.";
 	next;
 	mes "[Tempestra]";
-	mes "Boy, the heat is making me thirsty.  Nothing would be better right now, than sipping on a perfectly chilled yellow potion.....";
+	mes "Oh, I'm sooo thirsty! A nice, chilled Yellow Potion would be perfect right about now~";
 	next;
-	menu "Here you go, my treat.",-, "Then go get one, sheesh....",M_1;
-
-		if(countitem(503) < 1) goto L_NoPot;
-		delitem 503, 1;
-		set MISC_QUEST,MISC_QUEST | 2;
-		mes "[Tempestra]";
-		mes "Oooh! Thank you so much.  I'm so glad to meet such a friendly person here....";
-		emotion e_thx;
-		next;
-		mes "[Tempestra]";
-		mes "(~gulp~gulp~)";
-		next;
-		mes "[Tempestra]";
-		mes "Hyaaaaaaa!! It's sooo cold!! Thank you.";
-	sM_Menu:
-		next;
-		menu "The weather is really hot, isn't it...",-, "You should wear a hat.",sM_1;
-
+	switch(select("Let me treat you to a Yellow Potion.:What, you expect me to give you one?!")) {
+	case 1:
+		if (countitem(503) > 0){
 			mes "[Tempestra]";
-			mes "Yes, it's very hot indeed.....";
+			mes "Ah, thank you so much. I'm so glad to have met a friendly person like yourself.";
 			next;
-			mes "[Tempestra]";
-			mes "Luckly I brought a lot of hats along.  I have";
-			mes "a ^5555FF'Sunday Hat'^000000,";
-			mes "a ^5555FF'Mage Hat'^000000,";
-			mes "a ^5555FF'Magician Hat'^000000, and more in my room...";
+			mes "^3355FF*Gulp, gulp*^000000";
+			delitem 503,1;  //Yellow_Potion
 			next;
 			mes "[Tempestra]";
-			mes "I brought these hats with me so that I could sell them and use the money I made for my vacation expenses....";
-			mes "but now it looks like I'll have to wear one.....";
-		ssM_Menu:
+			mes "Hyaaaaaa~~!!!";
+			mes "It's so cold!! Thank you~~~";
 			next;
-			menu "Sunday Hat?",-, "Mage Hat?",ssM_0b, "Magician Hat?",ssM_0c, "End Conversation.",ssM_End;
-
+			switch(select("It's really hot, isn't it~?:You should wear your hat...")) {
+			case 1:
 				mes "[Tempestra]";
-				mes "A Sunday Hat is made up of:";
-				mes "- ^5555FF250 Fabric^000000,";
-				mes "- ^5555FF1 Slotted Hat^000000,";
-				mes "- ^5555FF1 Slotted Cap^000000,";
-				mes "- ^5555FF600 Soft Feathers^000000.";
-				mes "If you want, I can make one for you.  Just bring me all of those items.";
+				mes "Yeah~ it's really hot....";
 				next;
-				menu "Make one for me.",-, "Cancel",ssM_End;
-
-					if (countitem(1059)<250 || countitem(2221)<1 || countitem(2227)<1 || countitem(7063)<600) goto ssM_Menu;
-					delitem 1059, 250;
-					delitem 2221, 1;
-					delitem 2227, 1;
-					delitem 7063, 600;
+				mes "[Tempestra]";
+				mes "I have";
+				mes "^0000FFSunday Hat^000000,";
+				mes "^0000FFMage Hat^000000 and...";
+				mes "^0000FFMagician Hat^000000 and more in my room.";
+				next;
+				mes "[Tempestra]";
+				mes "I brought these hats so I can sell them and use the money for my vacation here, but now it looks like I have to wear one~";
+				next;
+				switch(select("Sunday Hat!!?:Mage Hat?!?:Magician Hat??!??")) {
+				case 1:
 					mes "[Tempestra]";
-					mes "Please wait just a moment while I make it........";
+					mes "Oh? Didn't you know? I'm a hat merchant. Didn't I tell you that before?";
 					next;
-					getitem 5032, 1;
 					mes "[Tempestra]";
-					mes "All done... one Sunday Hat just for you.  Thank you and come back any time.";
-					emotion e_thx;
-					close;
-			ssM_0b:
-				mes "[Tempestra]";
-				mes "A Mage Hat is made up of:";
-				mes "- ^5555FF1 Wizard Hat^000000,";
-				mes "- ^5555FF400 Dragon Scales^000000,";
-				mes "- ^5555FF50 Mould Powder^000000,";
-				mes "- ^5555FF1 Elder Wilow Card^000000.";
-				mes "If you want, I can make one for you.  Just bring me all of those items.";
-				next;
-				menu "Make one for me.",-, "Cancel",ssM_End;
-
-					if (countitem(2252)<1 || countitem(1036)<400 || countitem(7001)<50 || countitem(4052)<1) goto ssM_Menu;
-					delitem 2252, 1;
-					delitem 1036, 400;
-					delitem 7001, 50;
-					delitem 4052, 1;
+					mes "Hmm, I guess I didn't. I apologize. Ooh! You know what, I could make you a Sunday Hat~!";
+					next;
 					mes "[Tempestra]";
-					mes "Please wait just a moment while I make it........";
+					mes "I'd need...";
+					mes "^0000FF250 Fabric^000000";
+					mes "^0000FF1 Slotted Hat^000000";
+					mes "^0000FF1 Slotted Cap^000000";
+					mes "^0000FF600 Soft feather^000000";
 					next;
-					getitem 5027, 1;
+					if ((countitem(1059) > 249) && (countitem(2221) > 0) && (countitem(2227) > 0) && (countitem(7063) > 599)) {
+						mes "[Tempestra]";
+						mes "What?!? ";
+						mes "You have all the items already? If there are forged items or slotted items with monster cards, then put them into your storage.";
+						next;
+						mes "[Tempestra]";
+						mes "I just want to make something for the Yellow Potion, so I won't charge you any zeny for my hat making service.";
+						switch(select("Oh, please do.:No thanks.")) {
+						case 1:
+							next;
+							mes "[Tempestra]";
+							mes "Alrighty. Just give me a moment...";
+							next;
+							mes "^3355FF*Thud! Boot!*";
+							mes "*Thic-Tac!*^000000";
+							next;
+							mes "^3355FF*Beeeeeeeh~~~*^000000";
+							next;
+							delitem 1059,250;  //Transparent_Cloth
+							delitem 2221,1;  //Hat_
+							delitem 2227,1;  //Cap_
+							delitem 7063,600;  //Soft_Feather
+							mes "[Tempestra]";
+							mes "Here it is, tee hee~";
+							mes "How about that? Do you like it?";
+							getitem 5032,1; // Picnic_Hat
+							next;
+							mes "[Tempestra]";
+							mes "Once again, thank you for your favour. I'll see you later~";
+							close;
+						case 2:
+							next;
+							mes "[Tempestra]";
+							mes "Oh alright~";
+							next;
+							mes "[Tempestra]";
+							mes "If by any chance you visit me later, I'd be more than happy to make a hat for you~";
+							next;
+							mes "[Tempestra]";
+							mes "Well then, see you later~";
+							close;
+						}
+					}
+					else {
+						mes "[Tempestra]";
+						mes "I will tell you a secret, beause you gave me the Yellow Potion~";
+						next;
+						mes "[Tempestra]";
+						mes "I'm looking forward seeing you again~~";
+						close;
+					}
+				case 2:
 					mes "[Tempestra]";
-					mes "All done... one Mage Hat just for you.  Thank you and come back any time.";
-					emotion e_thx;
-					close;
-			ssM_0c:
-				mes "[Tempestra]";
-				mes "A Magician Hat is made up of:";
-				mes "- ^5555FF1 Wizard Hat^000000,";
-				mes "- ^5555FF450 Ancient Lips^000000,";
-				mes "- ^5555FF1200 Solid Shells^000000,";
-				mes "If you want, I can make one for you.  Just bring me all of those items.";
-				next;
-				menu "Make one for me.",-, "Cancel",ssM_End;
-
-					if (countitem(2252)<1 || countitem(1054)<450 || countitem(943)<1200) goto ssM_Menu;
-					delitem 2252, 1;
-					delitem 1054, 450;
-					delitem 943, 1200;
+					mes "Oh? Didn't you know? I'm a hat merchant. Didn't I tell you that before?";
+					next;
 					mes "[Tempestra]";
-					mes "Please wait just a moment while I make it........";
+					mes "Hmm, I guess I didn't. I apologize. Ooh! You know what, I could make you a Mage Hat!";
 					next;
-					getitem 5045, 1;
 					mes "[Tempestra]";
-					mes "All done... one Magician just for you.  Thank you and come back any time.";
-					emotion e_thx;
-					close;
-			ssM_End:
-				close;
-
-		sM_1:
-			mes "[Tempestra]";
-			mes "Oh but the hats I have are for sale.... if I use them for myself I won't be able to sell them to my customers.";
-			next;
-			mes "[Tempestra]";
-			mes "Because you gave me the potion, I would like to make something for you.  Unfortuately I don't have any materials right now.";
-			next;
-			mes "[Tempestra]";
-			mes "Hmm... If you have:";
-			mes "^5555FF1 Emblem of the Sun God";
-			mes "10 Gold";
-			mes "40 Steel";
-			mes "50 Coal";
-			mes "and 2 Oridecon^000000..........";
-			next;
-			mes "[Tempestra]";
-			mes "I can make you a ^5555FF'Hat of the Sun God'^000000!! It's a fantastic piece of work! How's that sound?";
-			next;
-			menu "Alright.",-, "Not right now thanks.",ssM_1b;
-
-				if(countitem(7086)<1 || countitem(969)<10 || countitem(999)<40 || countitem(1003)<50 || countitem(984)<2) goto ssL_NotEnuf;
-				delitem 7086, 1;
-				delitem 969, 10;
-				delitem 999, 40;
-				delitem 1003, 50;
-				delitem 984, 2;
+					mes "^0000FF1 Wizard Hat^000000";
+					mes "^0000FF400 Dragon Scale^000000";
+					mes "^0000FF50 Mould Powder^000000";
+					mes "^0000FF1 Elder Wilow Card^000000";
+					next;
+					if ((countitem(2252) > 0) && (countitem(1036) > 399) && (countitem(4052) > 0) && (countitem(7001) > 49)) {
+						mes "[Tempestra]";
+						mes "What?!? ";
+						mes "You have all the items already? If there are forged items or slotted items with monster cards, then put them into your storage.";
+						next;
+						mes "[Tempestra]";
+						mes "I just want to make something nice for you, so I won't charge you any zeny for my hat making service.";
+						switch(select("Oh, please do.:No thanks.")) {
+						case 1:
+							next;
+							mes "[Tempestra]";
+							mes "Alrighty. Just give me a moment...";
+							next;
+							mes "^3355FF*Thud! Boot!*";
+							mes "*Thic-Tac!*^000000";
+							next;
+							mes "^3355FF*Beeeeeeeh~~~*^000000";
+							next;
+							delitem 2252,1;  //Star_Sparkling
+							delitem 1036,400;  //Dragon_Scale
+							delitem 4052,1;  //Elder_Wilow_Card
+							delitem 7001,50;  //Mould_Powder
+							mes "[Tempestra]";
+							mes "Here it is, tee hee~";
+							mes "How about that?";
+							mes "Do you like it?";
+							getitem 5027,1; // Wizardry_Hat
+							next;
+							mes "[Tempestra]";
+							mes "Once again, thank you for your favour. I'll see you later~";
+							close;
+						case 2:
+							next;
+							mes "[Tempestra]";
+							mes "Oh alright~";
+							next;
+							mes "[Tempestra]";
+							mes "If by any chance you visit me later, I'd be more than happy to make a hat for you~";
+							next;
+							mes "[Tempestra]";
+							mes "Well then, see you later~";
+							close;
+						}
+					}
+					else {
+						mes "[Tempestra]";
+						mes "I will tell you a secret, beause you gave me the Yellow Potion~";
+						next;
+						mes "[Tempestra]";
+						mes "I'm looking forward seeing you again~~";
+						close;
+					}
+				case 3:
+					mes "[Tempestra]";
+					mes "Oh? Didn't you know? I'm a hat merchant. Didn't I tell you that before?";
+					next;
+					mes "[Tempestra]";
+					mes "Hmm, I guess I didn't. I apologize. Ooh! You know what, I could make you a Magician Hat!";
+					next;
+					mes "[Tempestra]";
+					mes "^0000FF1 Wizard Hat^000000";
+					mes "^0000FF450 Ancient Lips^000000";
+					mes "^0000FF1200 Solid Shell^000000";
+					next;
+					if ((countitem(2252) > 0) && (countitem(1054) > 449) && (countitem(943) > 1199)) {
+						mes "[Tempestra]";
+						mes "What?!? ";
+						mes "You have all the items already?";
+						mes "If there are forged items or slotted items with monster cards, then put them into your storage.";
+						next;
+						mes "[Tempestra]";
+						mes "I just want to make something nice for you, so I won't charge you any zeny for my hat making service.";
+						switch(select("Please do:No thanks")) {
+						case 1:
+							next;
+							mes "[Tempestra]";
+							mes "Alrighty. Just give me a moment...";
+							next;
+							mes "^3355FF*Thud! Boot!*";
+							mes "*Thic-Tac!*^000000";
+							next;
+							mes "^3355FF*Beeeeeeeh~~~*^000000";
+							next;
+							delitem 2252,1;  //Star_Sparkling
+							delitem 1054,450;  //Lip_Of_Ancient_Fish
+							delitem 943,1200;  //Solid_Shell
+							mes "[Tempestra]";
+							mes "Here it is, tee hee~";
+							mes "How about that?";
+							mes "Do you like it?";
+							getitem 5045,1; // Magician_Hat
+							next;
+							mes "[Tempestra]";
+							mes "Once again, thank you for your favour. I'll see you later~";
+							close;
+						case 2:
+							next;
+							mes "[Tempestra]";
+							mes "Oh alright~";
+							next;
+							mes "[Tempestra]";
+							mes "If by any chance you visit me later, I'd be more than happy to make a hat for you~";
+							next;
+							mes "[Tempestra]";
+							mes "Well then, see you later~";
+							close;
+						}
+					}
+					else {
+						mes "[Tempestra]";
+						mes "I will tell you a secret, beause you gave me the Yellow Potion~";
+						next;
+						mes "[Tempestra]";
+						mes "I'm looking forward seeing you again~~";
+						close;
+					}
+				}
+			case 2:
 				mes "[Tempestra]";
-				mes "Please wait just a moment while I make it........";
+				mes "Well, the hats I have with me are for my customers. If I use them for myself, I'll have nothing to sell...";
 				next;
-				getitem 5022, 1;
 				mes "[Tempestra]";
-				mes "All done... one Hat of the Sun God just for you.  Thank you again for the potion, and please come back any time.";
-				emotion e_thx;
-				close;
-
-				ssL_NotEnuf:
+				mes "I want to make something special for you because you showed me such kindness, but I don't have anything like that right now.";
+				next;
+				if ((countitem(7086) > 0) && (countitem(614) > 9) && (countitem(999) > 39) && (countitem(1003) > 49) && (countitem(615) > 1)) {
+					mes "[Tempestra]";
+					mes "Hmm...";
+					mes "I think I can make a special item from the items you already have.";
+					next;
+					mes "[Tempestra]";
+					mes "If there are any forged items or slotted items with monster cards, then put them into your Kafra storage.";
+					next;
+					mes "[Tempestra]";
+					mes "Heh heh...";
+					mes "I think I'll make you a Hat of the Sun God~";
+					next;
+					delitem 7086,1;  //Symbol_Of_Sun
+					delitem 614,10;  //Gold
+					delitem 999,40;  //Steel
+					delitem 1003,50;  //Coal
+					delitem 615,2;  //Oridecon
 					mes "[Tempestra]";
-					mes "Um.... where are those items exactly???";
-					emotion e_hmm;
+					mes "See! Here it is!!";
+					mes "Haha, I made this quicker than the speed of light!";
+					next;
+					mes "[Tempestra]";
+					mes "...Or maybe I just gave you the one I already had, and took your items. Hee hee!";
+					getitem 5022,1; // Helm_Of_Sun
+					next;
+					mes "[Tempestra]";
+					mes "Anyway, I justed want to give something really nice to you...";
 					close;
-			ssM_1b:
-				mes "[Tempestra]";
-				mes "Come back anytime when you've changed your mind.";
-				close;
-
-		L_NoPot:
+				}
+				else {
+					mes "[Tempestra]";
+					mes "Hmm...";
+					mes "^0000FF1 Amblem of the Sun God^000000";
+					mes "^0000FF10 Gold^000000";
+					mes "^0000FF40 Steel^000000";
+					mes "^0000FF50 Coal^000000";
+					mes "^0000FF2 Oridecon^000000";
+					next;
+					mes "[Tempestra]";
+					mes "If you have these, I can make you my fantastic 'Hat of the Sun God!'";
+					next;
+					mes "[Tempestra]";
+					mes "I just want to make something really special for you, so I won't charge you any zeny to make this hat.";
+					close;
+				}
+			}
+		}
+		else {
 			mes "[Tempestra]";
-			mes "Umm... excuse me but.... where is the potion??";
-			emotion e_hmm;
+			mes "Umm, I appreciate it but, I guess you just ran out of Yellow Potions?";
 			close;
-
-	M_1:
+		}
+	case 2:
 		mes "[Tempestra]";
-		mes "..... How RUDE!!";
-		emotion e_gasp;
+		mes "....How rude!";
 		close;
+	}
 }
 
 //=======================================================================================================//
@@ -1951,7 +2078,6 @@ OnTouch:
 	mes "No.";
 	mes "And shut up.";
 	close;
-	end;
 }
 
 tur_dun03,105,74,4	script	Mudasamu#tur	119,{
diff --git a/npc/quests/quests_aldebaran.txt b/npc/quests/quests_aldebaran.txt
index ae27d1cb1..500a07be5 100644
--- a/npc/quests/quests_aldebaran.txt
+++ b/npc/quests/quests_aldebaran.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //= Fully working
 //= 1.1 Fixed Doctor Band items [Lupus]
 //= 1.2 Removed Duplicates [Silent]
+//= 1.3 Updated headgear NPC. [L0ne_W0lf]
 //============================================================ 
 
 
@@ -20,74 +21,92 @@
 //=======================================================================================================//
 aldeba_in,152,166,4	script	Trader#01	86,{
 	mes "[Trader]";
-	mes "Muhahaha! I am the Very Famous Enigmatic Dealer! I am always hustling and bustling in and out of Rune Midgard!";
-	mes "Take a look at my RARE and UNIQUE items from ALL OVER the WORLD!!";
+	mes "Who is this mysterious man?";
+	mes "I, the enigmatic and debonair 'Trader?'";
 	next;
-	mes "(1) · ^3355FFDoctor Band^000000 :";
-	mes "^FF55331 Red Bandana + 50 Iron + 1 Cracked Diamond + 3500 Zeny^000000.";
-	mes "(2) · ^3355FFFeather Bonnet^000000 :";
-	mes "^FF55331 Romantic Gent + 300 Feather of Birds + 500 Zeny^000000.";
-	mes "(3) · ^3355FFOpera Masque^000000 :";
-	mes "^FF553320 Iron + 1 Singing Plant + 5000 Zeny^000000.";
-	mes "(4) · ^3355FFSakkat Hat^000000 :";
-	mes "^FF5533120 Trunk + 10000 Zeny^000000.";
+	mes "[Trader]";
+	mes "Traveling about the Rune-Midgard Continent, with all of his wonderful hats? Nobody knows...";
 	next;
-	menu "Doctor Band",-, "Feather Bonnet",M_1, "Opera Masque",M_2, "Sakkat",M_3;
-		
-		mes "[Trader]";
-		if(countitem(2275) == 0 || countitem(998) < 50 || countitem(733) == 0 || Zeny < 3500) goto L_CantMake;
-		delitem 2275,1;//Items: Red Bandana,
-		delitem 998,50;//Items: Iron,
-		delitem 733,1;//Items: Cracked deamond
-		set Zeny,Zeny - 3500;
-		mes "Hmm.... Do you have a.... MEDICAL LICENSE?!";
-		emotion e_what;
-		next;
-		mes "[Trader]";
-		mes "I've heard about a well-known unlicensed physician 'Cuwaki'... I hope you don't get caught....";
-		mes "Anyways it's your own buisness what you do... Take this.";
-		getitem 2273,1;//Items: Doctor Band,
-		close;
-	M_1:
-		mes "[Trader]";
-		if(countitem(2247) == 0 || countitem(916) < 300 || Zeny < 500) goto L_CantMake;//Items: Romantic Gent, Feather of Birds,
-		delitem 2247,1;//Items: Romantic Gent,
-		delitem 916,300;//Items: Feather of Birds,
-		set Zeny,Zeny - 500;
-		mes "Umhahaha. You have good fashion sense.  I know you had a hard time collecting these items, but this bonnet is definately worth it.  Take it.";
-		emotion e_heh;
-		getitem 5018,1;//Items: Feather Bonnet,
-		close;
-	M_2:
-		mes "[Trader]";
-		if(countitem(998) < 20 || countitem(707) == 0 || Zeny < 5000) goto L_CantMake;//Items: Iron, Singing Plant,
-		delitem 998,20;//Items: Iron,
-		delitem 707,1;//Items: Singing Plant,
-		set Zeny,Zeny - 5000;
-		mes "This is a pretty nice item.  A little bit creepy looking though.... I think it gives off some kinda weird vibe.  What do you think?";
-		next;
-		mes "[Trader]";
-		mes ".. You like it ..Alright.. Take it!";
-		getitem 2281,1;//Items: Opera Masque,
-		close;
-	M_3:
-		mes "[Trader]";
-		if(countitem(1019) < 120 || Zeny < 10000) goto L_CantMake;//Items: Trunk,
-		delitem 1019,120;//Items: Trunk,
-		set Zeny,Zeny - 10000;
-		mes "If you have a chance to visit the Village of Payon, please go meet the Sakkat Craftsman.";
-		mes "He's never sold a Sakkat to any other dealer but to me.";
-		next;
-		mes "[Trader]";
-		mes "Because only I can recognize a Sakkat hats' quality.  Due to the fact that it's so rare, the Sakkat Hat has become a very popular item!";
-		next;
-		mes "[Trader]";
-		mes "OK! Take it!";
-		getitem 2280,1;//Items: Sakkat,
-		close;
-
-	L_CantMake:
-		mes "You, fool! Check the requirements again..... you're not some kinda idiot are you? C'mon..... give me a break.";
-		emotion e_an;
-		close;
+	mes "[Trader]";
+	mes "For what purpose do I collect and trade these hats from all around the world? Choose a hat, get closer to unraveling the mystery...";
+	next;
+	mes " (1) ^3355FFDoctor Band^000000:";
+	mes "1 Red Bandana + 50 Irons + 1 Cracked Diamond + 3500 Zeny";
+	mes " (2)^3355FFFeather Bonnet^000000:";
+	mes "1 Romantic Gent + 300 Feather of Birds + 500 Zeny";
+	mes " (3) ^3355FFPhantom of Opera^000000:";
+	mes "20 Iron + 1 Singing Plant + 5000 Zeny ";
+	mes " (4) ^3355FFSakkat^000000:";
+	mes "120 Trunks + 10000 Zeny ";
+	next;
+	switch(select(" Doctor Band : Feather Bonnet : Phantom of Opera : Sakkat ")) {
+	case 1:
+		if ((countitem(2275) > 0) && (countitem(613) > 49) && (Zeny > 3499)) {
+			delitem 2275,1;  //Red_Bandana
+			delitem 613,50;  //Iron
+			set Zeny,Zeny-3500;
+			mes "[Trader]";
+			mes "Hm! You don't have a medical license, do you? It's alright, I've heard about a rogue, unlicensed physician who performed medical miracles! But... That might have been a comic book.";
+			next;
+			mes "[Trader]";
+			mes "Oh whatever. Just don't get caught.";
+			getitem 2273,1; // Doctor_Cap
+			close;
+		}
+		else {
+			mes "[Trader]";
+			mes "You guy~";
+			mes "Check the requirements again.";
+			mes "You don't look like an idiot though. So c'mon man, get real.";
+			close;
+		}
+	case 2:
+		if ((countitem(2247) > 0) && (countitem(916) > 299) && (Zeny > 499)) {
+			delitem 2247,1;  //Oldman's_Romance
+			delitem 916,300;  //Feather_Of_Birds
+			set Zeny,Zeny-500;
+			mes "[Trader]";
+			mes "Ooh~! You have good fashion sense. I know you've had a hard time collecting this stuff, but this hat is worth it. Take it. All you need now is a fur coat and a cane!";
+			getitem 5018,1; // Feather_Bonnet
+			close;
+		}
+		else {
+			mes "[Trader]";
+			mes "You guy~";
+			mes "Go check my requirements again. You don't look like an idiot though. C'mon man, get real.";
+			close;
+		}
+	case 3:
+		if ((countitem(613) > 19) && (countitem(707) > 0) && (Zeny > 4999)){ //Iron Singing_Plant 
+			delitem 613,20;  //Iron
+			delitem 707,1;  //Singing_Plant
+			set Zeny,Zeny-5000;
+			mes "[Trader]";
+			mes "This one? It's a little bit scary, though it has some sort of romantic quality. What do you think? You like it? Alright, take it, it's yours!";
+			getitem 2281,1; // Phantom_Of_Opera
+			close;
+		}
+		else {
+			mes "[Trader]";
+			mes "Buffoon. Go check the requirements again. ^3355FFPhantom of Opera^000000 isn't easy to come by. So c'mon man, get real.";
+			close;
+		}
+	case 4:
+		if ((countitem(1019) > 119) && (Zeny > 9999)){ //Wooden_Block 
+			delitem 1019,120;  //Wooden_Block
+			set Zeny,Zeny-10000;
+			mes "[Trader]";
+			mes "If you have a chance to visit the Uplander Village, Payon, please go and meet the Sakkat Craftsman.";
+			next;
+			mes "[Trader]";
+			mes "He's never sold Sakkat to Traders other than me, since only I can recognize its quality. Due to its rarity, Sakkat has become a very unique and exceptional product. Okay! Take it, it's yours!";
+			getitem 2280,1; // Sahkkat
+			close;
+		}
+		else {
+			mes "[Trader]";
+			mes "MORON~ Check my requirements again. C'mon man, you don't look like an idiot, so get real~";
+			close;
+		}
+	}
 }
diff --git a/npc/quests/quests_comodo.txt b/npc/quests/quests_comodo.txt
index 98e135f41..af4b54bdf 100644
--- a/npc/quests/quests_comodo.txt
+++ b/npc/quests/quests_comodo.txt
@@ -27,244 +27,449 @@
 //= 1.5 Rescripted Headgear Quests 1 to Aegis 10.3 Standards. [Samuray22]
 //= 1.5a Fixed a bad countitem. (bugreport:840) [Samuray22]
 //= 1.5b Fixed stripped hairband and blue hairband checking the wrong amount of items, bugreport:1674 [Brainstorm]
+//= 1.6 Updated headgear quest NPCs. [L0ne_W0lf]
 //============================================================ 
 
 // Headgear Quests 1
 // Cross Hat, Bulb Hairband, Striped Hairband, Blue Hairband
 //============================================================ 
-comodo,228,159,4	script	Hair Ornament Girl	700,{
+comodo,228,159,3	script	Hair Ornament Girl	700,{
 	mes "[Hair Ornament Girl]";
-	if(Sex == 1) {
-		mes "Oh! hi. You wanna make one?";
-		mes "If you want to give present to girl friend, Hair band is the one.";
-	} else {
-		mes "Hey! look at me. I think this will suit to you so much~";
-		mes "You wanna order one of Hair Band?";
+	if (Sex == 1) {
+		mes "Oh, hello!";
+		mes "Would you like to order a hairband? They're great presents to give to your girlfriend, and show that you're thinking of her.";
+	}
+	else {
+		mes "Hello~!";
+		mes "I think one of these will suit a pretty girl like you very well. Would you like to order a hairband?";
 	}
 	next;
 	mes "[Hair Ornament Girl]";
-	mes "If you give me simple items then I make a gorgeous Hair Band~";
-	mes "Have a look at these.";
+	mes "If you give me a few simple items then I can make a gorgeous Hair Band. If you have any questions, go ahead and have a look.";
 	next;
-	switch(select("Cross Band:Light Bulb Band:Stripe band:Blue hair band")) {
-	case 1:	
-		callsub L_select,1,2608,1,7069,500,0,0,5036; //Cross Band (1) = Rosary (1) + Destroyed Armor (500)
+	switch(select("Cross Hat:Bulb Band:Stripe Hairband:Blue Hairband")) {
+	case 1:
+		if ((countitem(2608) > 0) && (countitem(7069) > 499)) {
+			mes "[Hair Ornament Girl]";
+			mes "You've chosen the Cross Hat?";
+			mes "If you brought all the required items, I will make it for you~";
+			next;
+			mes "[Hair Ornament Girl]";
+			mes "But before I can make it, can you check that the items are right?";
+			mes "If it is a forged, upgraded item or has monster cards in it, then those cards and upgrades will be lost.";
+			next;
+			mes "[Hair Ornament Girl]";
+			mes "It's better to bring just to keep the requested items in your inventory. Did you check? Then let's make it, okay?";
+			next;
+			switch(select("No.:Yes.")) {
+			case 1:
+				mes "[Hair Ornament Girl]";
+				mes "Ah, alright. I guess you should put all your other things into Kafra Storage first. Okay then, see you soon.";
+				mes "See you soon~";
+				close;
+			case 2:
+				mes "^3355FFSwish swish snip snip^000000";
+				next;
+				delitem 2608,1;  //Rosary
+				delitem 7069,500;  //Broken_Armor_Piece
+				mes "[Hair Ornament Girl]";
+				mes "Look at this! Well done~";
+				mes "Please come again~ hoooo!";
+				getitem 5036,1; // Cross_Band
+				close;
+			}
+		}
+		else {
+			mes "[Hair Ornament Girl]";
+			mes "Oh, you've chosen Cross Hat?";
+			mes "There are some items needed to make this headband.";
+			next;
+			mes "[Hair Ornament Girl]";
+			mes "I'll need...";
+			mes "^3355FF1 Rosary^000000";
+			mes "^3355FF500 Destroyed Armor^000000";
+			next;
+			mes "[Hair Ornament Girl]";
+			mes "If you bring all the items then I will make it for you right away.";
+			mes "See you then~";
+			close;
+		}
 	case 2:
-		callsub L_select,2,2233,1,746,20,0,0,5034; //Bulb Band (1) = Circlet (1) + Glass Bead (20)
+		if ((countitem(2233) > 0) && (countitem(746) > 19)) {
+			mes "[Hair Ornament Girl]";
+			mes "You've chosen Bulb band?";
+			mes "If you brought all the required items, I will make it for you~";
+			next;
+			mes "[Hair Ornament Girl]";
+			mes "But before I can make it, can you check that the items are right?";
+			mes "If it is a forged, upgraded item or has monster cards in it, then those cards and upgrades will be lost.";
+			next;
+			mes "[Hair Ornament Girl]";
+			mes "It's better to bring just to keep the requested items in your inventory. Did you check? Then let's make it, okay?";
+			next;
+			switch(select("No.:Yes.")) {
+			case 1:
+				mes "[Hair Ornament Girl]";
+				mes "Ah, alright. I guess you should put all your other things into Kafra Storage first. Okay then, see you soon.";
+				close;
+			case 2:
+				mes "^3355FFSwish swish snip snip^000000";
+				next;
+				delitem 2233,1;  //Circlet_
+				delitem 746,20;  //Glass_Bead
+				mes "[Hair Ornament Girl]";
+				mes "Look at this! Well done~";
+				mes "Please come again~ hoooo!";
+				getitem 5034,1; // Light_Bulb_Band
+				close;
+			}
+		}
+		else {
+			mes "[Hair Ornament Girl]";
+			mes "Oh, you've chosen Bulb Band?";
+			mes "There are some required items needed to make this headband.";
+			next;
+			mes "[Hair Ornament Girl]";
+			mes "I'll need...";
+			mes "^3355FF1 Slotted Circlet^000000";
+			mes "^3355FF20 Glass Bead^000000";
+			next;
+			mes "[Hair Ornament Girl]";
+			mes "If you bring all the items then I will make it for you right away.";
+			mes "See you then~";
+			close;
+		}
 	case 3:
-		callsub L_select,3,1099,1500,0,0,0,0,5049; //Stripe Band (1) = Worn Out Prison Uniform (1500)
-	case 4:
-		callsub L_select,4,2211,1,978,1,7003,300,5052; //Blue hair band (1) = Bandana (1) + Cobaltblue Dyestuffs (1) + Anolian Skin (300)
-	}
-L_select:
-	mes "[Hair Ornament Girl]";
-	if((getarg(0) == 1 && countitem(2608) > 0 && countitem(7069) > 499) ||
-	   (getarg(0) == 2 && countitem(2233) > 0 && countitem(746) > 19) || 
-	   (getarg(0) == 3 && countitem(1099) > 1499) ||
-	   (getarg(0) == 4 && countitem(2211) > 0 && countitem(978) > 0 && countitem(7003) > 299)) {
-		mes "Hum~ You've chosen "+getitemname(getarg(7))+"?";
-		mes "You brought all required item. I will make you~";
-		next;
-		if(getarg(0) != 3) {
+		if (countitem(1099) > 1499) {
+			mes "[Hair Ornament Girl]";
+			mes "You've chosen Stripe band?";
+			mes "If you brought all the required items, I will make it for you~";
+			next;
 			mes "[Hair Ornament Girl]";
-			mes "But, before I make, can you check that Items are sure?";
-			mes "If it is forged item or monster cards is applied, then it is waste of item.";
+			mes "You want me to make it now?";
 			next;
+			switch(select("No.:Yes.")) {
+			case 1:
+				mes "[Hair Ornament Girl]";
+				mes "See you later then~";
+				close;
+			case 2:
+				mes "^3355FFSwish swish snip snip^000000";
+				next;
+				delitem 1099,1500;  //Worn_Out_Prison_Uniform
+				mes "[Hair Ornament Girl]";
+				mes "Look at this! Well done~";
+				mes "Please come again~";
+				getitem 5049,1; // Stripe_Band
+				close;
+			}
 		}
-		mes "[Hair Ornament Girl]";
-		mes "It's better to bring only just requested item";
-		mes "Did you check? Then let's make it. ok?";
-		next;
-		if(select("No.:Yes.") == 1) {
+		else {
+			mes "[Hair Ornament Girl]";
+			mes "Oh, you've chosen the Stripe band? There are some required items needed to make this headband.";
+			next;
 			mes "[Hair Ornament Girl]";
-			mes "Yes, Yes, Put other stuffs to storage~";
-			mes "See you soon~";
+			mes "I'll need...";
+			mes "^3355FF1500 Worn-out Prison Uniform^000000";
+			next;
+			mes "[Hair Ornament Girl]";
+			mes "If you bring all the items then I will make it for you right away.";
+			mes "See you then~";
 			close;
 		}
+	case 4:
+		if ((countitem(2211) > 0) && (countitem(978) > 0) && (countitem(7003) > 299)) {
+			mes "[Hair Ornament Girl]";
+			mes "You've chosen Blue Hairband?";
+			mes "If you brought all the required items, I will make it for you~";
+			next;
+			mes "[Hair Ornament Girl]";
+			mes "But before I can make it, can you check that the items are right?";
+			mes "If it is a forged, upgraded item or has monster cards in it, then those cards and upgrades will be lost.";
+			next;
+			mes "[Hair Ornament Girl]";
+			mes "It's better to bring just to keep the requested items in your inventory. Did you check? Then let's make it, okay?";
+			next;
+			switch(select("No.:Yes.")) {
+			case 1:
+				mes "[Hair Ornament Girl]";
+				mes "Ah, alright. I guess you should put all your other things into Kafra Storage first. Okay then, see you soon.";
+				close;
+			case 2:
+				mes "^3355FFSwish swish snip snip^000000";
+				next;
+				delitem 2211,1;  //Bandana
+				delitem 978,1;  //Cobaltblue_Dyestuffs
+				delitem 7003,300;  //Anolian_Skin
+				mes "[Hair Ornament Girl]";
+				mes "Look, at this! Well done!";
+				mes "Please come again~ ";
+				getitem 5052,1; // Blue_Hair_Band
+				close;
+			}
+		}
+		else {
 			mes "[Hair Ornament Girl]";
-			mes "^3355FFHm. Piece of cake^000000";
+			mes "Oh, you've chosen Blue Hairband?";
+			mes "There are some required items needed to make this headband.";
 			next;
-			delitem getarg(1),getarg(2);
-			if(getarg(3) != 0) delitem getarg(3),getarg(4);
-			if(getarg(5) != 0) delitem getarg(5),getarg(6);
 			mes "[Hair Ornament Girl]";
-			mes "Look, this! Well done~";
-			mes "Plaese come again~ hoooo!";
-			getitem getarg(7),1;
+			mes "I'll need...";
+			mes "^3355FF1 Bandana^000000";
+			mes "^3355FF1 Cobaltblue Dyestuffs^000000";
+			mes "^3355FF300 Anolian Skin^000000";
+			next;
+			mes "[Hair Ornament Girl]";
+			mes "If you bring all the items then I will make it for you right away.";
+			mes "See you then~";
 			close;
+		}
 	}
-		mes "Hum~ You've chosen "+getitemname(getarg(7))+"?";
-		mes "There is some requiring items to make, Prepare items.";
-		next;
-		mes "[Hair Ornament Girl]";
-		mes "To make "+getitemname(getarg(7))+"...";
-		mes "^3355FF"+getitemname(getarg(1))+"^000000 "+getarg(2)+"";
-		if(getarg(3) > 0) mes "^3355FF"+getitemname(getarg(3))+"^000000 "+getarg(4)+"";
-		if(getarg(5) > 0) mes "^3355FF"+getitemname(getarg(5))+"^000000 "+getarg(6)+"";
-		mes "...will need?";
-		next;
-		mes "[Hair Ornament Girl]";
-		mes "If you bring all items then I will make you right away.";
-		mes "Hoo~ see you then~";
-		close;
 }
 
 // Headgear Quests 2
 // 'Mine Helmet', 'Parcel Hat', 'Money Loser's Grief', 'Phantom of the Opera Mask'
 //============================================================ 
-comodo,274,137,5	script	Mari Isac	702,{
-	mes "[Mari Isac]";
-	mes "I travel all over the world and get to hear many interesting stories from the people I meet.";
-	mes "Sometimes they even teach me how to make special items";
+comodo,273,137,4	script	Traveler#head	702,{
+	mes "[Isac Mari]";
+	mes "I travel around the world, and collect many interesting stories from people. Sometimes they teach me how to make special items.";
 	next;
-	mes "[Mari Isac]";
-	mes "Would you be interested in some of the items I've learned to make?";
-M_Menu:
+	mes "[Isac Mari]";
+	mes "I know how to make all sorts of worldly hats. But right now, I can't make these since I don't have the right items.";
 	next;
-	menu "Tell me about them.",M_0, "Make me one.",M_1;
-
-	M_0:
-		menu "-Mine Helmet",-, "-Parcel Hat",sM_Parcel, "-Money Loser's Grief",sM_Money, "-Phantom of the Opera Mask",sM_Phantom;
-
-			mes "[Mari Isac]";
-			mes "I learned how to make the Mine Helmet when I traveled to the old coal mines near Geffen.";
-			next;
-			mes "[Mari Isac]";
-			mes "The 2 most important things a miner needs are light, and head protection.";
-			mes "A very inventive miner was able to create something that dealt with both issues.";
-			next;
-			mes "[Mari Isac]";
-			mes "He attached a light to his safety helmet and called it a Mine Helmet.";
-			mes "This meant that miners no longer had to worry about carrying around lamps and could work more efficiently.";
-			next;
-			mes "[Mari Isac]";
-			mes "Anyways, if you want me to make you a Mine Helmet you'll need to bring me these items:";
-			mes "^5555FF1 Safety Helmet^000000,";
-			mes "^5555FF1 Candle^000000,";
-			mes "^5555FF1 Crystal Mirror^000000,";
-			mes "^5555FF25 Steel^000000.";
-			next;
-			goto M_0;
-		sM_Parcel:
-			mes "[Mari Isac]";
-			mes "I learned how to make the Parcel Hat when I traveled to Alberta.  There they have a unique way of distributing mail and goods.";
-			next;
-			mes "[Mari Isac]";
-			mes "Instead of using a pouch or a sack to carry items for delivery, they use a special kind of hat, called a Parcel Hat.";
-			mes "This hat allows the delivery personel to carry numerous items on their heads.  Of course they have to have good balance to use it.";
-			next;
-			mes "[Mari Isac]";
-			mes "Anyways, if you want me to make you a Parcel Hat, you'll need to bring me these items.";
-			mes "^5555FF150 Fabric^000000,";
-			mes "^5555FF100 Resin^000000,";
-			mes "^5555FF1 Cobaltblue Dyestuffs^000000.";
-			next;
-			goto M_0;
-		sM_Money:
-			mes "[Mari Isac]";
-			mes "I learned how to make the Money Loser's Grief when I traveled to Morroc.";
-			next;
-			mes "[Mari Isac]";
-			mes "A long time ago an honest merchant got into a conflict with a crooked guild.";
-			mes "Unlike the dirty guild, the merchant did not scam or cheat people.";
-			next;
-			mes "[Mari Isac]";
-			mes "Because of this they attacked the merchants shop and took all of his goods.";
-			next;
-			mes "[Mari Isac]";
-			mes "The merchant was devastated by the loss of his shop.";
-			mes "In his sadness he used the bits and pieces that were left from his shop to create a new item.";
-			next;
-			mes "[Mari Isac]";
-			mes "He created the Money Loser's Grief, a symbol of his great sadness.  When people see it, they can't help but feel sympathetic to the wearer.";
-			next;
-			mes "[Mari Isac]";
-			mes "Many merchants now wear it to help themselves get more business.  Of course it is also a reminder of the honest merchants sad tale.";
-			next;
-			mes "[Mari Isac]";
-			mes "Anyways, if you want me to make you a Money Losers Grief, you'll need to bring me these items.";
-			mes "^5555FF1 Circlet with a single slott^000000,";
-			mes "^5555FF1 Gold^000000,";
-			mes "^5555FF20 Steel^000000,";
-			mes "^5555FF80 Feathers^000000,";
-			mes "^5555FF800 Sticky Mucus^000000.";
-			next;
-			goto M_0;
-		sM_Phantom:
-			mes "[Mari Isac]";
-			mes "I learned how to make the Phantom of the Opera Mask when I traveled to Al De Baran.";
-			mes "The story behind this item is that of a man's pure love........";
-			next;
-			mes "[Mari Isac]";
-			mes "There once was a man who was in love with a beautiful opera singer.";	
-			mes "Unfortunately the man had a terribly disfigured face which forced to him to wear a mask.";
-			next;
-			mes "[Mari Isac]";
-			mes "He was ashamed of his appearance and could never bring himself to face the singer.";
-			mes "The man instead, watched her from a far, admiring every nuance of her beauty and grace.";
-			next;
-			mes "[Mari Isac]";
-			mes "He lurked in the bowles of the opera house and from time to time he would sing his sad love song.";
-			mes "Many people heard it and believed that there was a phantom haunting the opera house.";
-			next;
-			mes "[Mari Isac]";
-			mes "The singer also heard his song, and through it she was able to feel his pain and his love for her.";
-			mes "The two eventually met, and when they did she was able to look past his appereance and accept him for who he was.";
-			next;
-			mes "[Mari Isac]";
-			mes "Too this day, the tale of the masked 'phantom' is still romantacised.";
-			next;
-			mes "[Mari Isac]";
-			mes "Anyways, if you want me to make you a Phantom of the Opera Mask, you'll need to bring me these items.";
-			mes "^5555FF1 Opera Masque^000000,";
-			mes "^5555FF50 Horrendous Hairs^000000.";
-			goto M_0;
-
-	M_1:
-		menu "-Mine Helmet",-, "-Parcel Hat",sM_MakePar, "-Money Loser's Grief",sM_MakeMon, "-Phantom of the Opera Mask",sM_MakePhan;
-
-			if(countitem(5009)<1 || countitem(5028)<1 || countitem(747)<1 || countitem(999)<25) goto ssL_NoItems;
-			delitem 5009, 1;
-			delitem 5028, 1;
-			delitem 747, 1;
-			delitem 999, 25;
-			mes "[Mari Isac]";
-			mes "Here you go.  Enjoy your Mine Helmet!";
-			getitem 5031,1;
-			close;
-		sM_MakePar:
-			if(countitem(1059)<150 || countitem(907)<100 || countitem(978)<1) goto ssL_NoItems;
-			delitem 1059, 150;
-			delitem 907, 100;
-			delitem 978, 1;
-			mes "[Mari Isac]";
-			mes "Here you go.  Enjoy your Parcel Hat!";
-			getitem 5023,1;
+	switch(select("Mine Helmet:Parcel Hat:Grief for Greed:Opera Phantom Mask")) {
+	case 1:
+		if ((countitem(5009) > 0) && (countitem(5028) > 0) && (countitem(999) > 24) && (countitem(747) > 0)) {
+			mes "[Isac Mari]";
+			mes "Mine Helmet was designed for the miners in the coal mines to have light in the dark. If you brought all the required items, I will go ahead and make it for you~";
+			next;
+			mes "[Isac Mari]";
+			mes "But can you check that the items in your inventory aren't upgraded or have cards compounded into them? If any of the required items have forged upgrades or cards, those will be lost once I create the Mine Hat.";
+			next;
+			mes "[Isac Mari]";
+			mes "It's better to keep only the items used to make the Mine Hat in your inventory. Did you check? If so, let's get started.";
+			next;
+			switch(select("Give me a minute~!:Let's make the Mine Hat.")) {
+			case 1:
+				mes "[Isac Mari]";
+				mes "Alright. Please check your items again. It's much better to be safe than sorry.";
+				close;			break;
+			case 2:
+				mes "^3355FF*Thook Thook*";
+				mes "*Pop!*^000000";
+				next;
+				mes "[Isac Mari]";
+				mes "Whew! This is pretty hard!";
+				next;
+				delitem 5009,1;  //Safety_Helmet
+				delitem 5028,1;  //Candle
+				delitem 747,1;  //Crystal_Mirror
+				delitem 999,25;  //Steel
+				mes "[Isac Mari]";
+				mes "I'm not quite sure if this is the right one, but it looks about right. Ha ha~";
+				getitem 5031,1; // Mine_Helm
+				close;
+			}
+		}
+		else {
+			mes "[Isac Mari]";
+			mes "I hear Mine Helmets are used in the mines near Geffen. As you know, it's not possible to work without light, even though it attracts monsters in the caves.";
+			next;
+			mes "[Isac Mari]";
+			mes "One day, a miner remodeled his own Safety Helmet so that he could work with both hands. Since then, it's been called the Mine Helm.";
+			next;
+			mes "[Isac Mari]";
+			mes "If you want to make Mine Helmet,";
+			mes "^3355FF1 Safety Helmet^000000";
+			mes "^3355FF1 Candle^000000 ";
+			mes "^3355FF1 Crystal Mirror^000000";
+			mes "^3355FF25 Steel^000000";
+			mes "is needed to create it.";
+			next;
+			mes "[Isac Mari]";
+			mes "If you bring all the items then I will make it for you right away. See you later~";
 			close;
-		sM_MakeMon:
-			if(countitem(2233)<1 || countitem(969)<1 || countitem(999)<20 || countitem(949)<80 || countitem(938)<800) goto ssL_NoItems;
-			delitem 2233, 1;
-			delitem 969, 1;
-			delitem 999, 20;
-			delitem 949, 80;
-			delitem 938, 800;
-			mes "[Mari Isac]";
-			mes "Here you go.  Enjoy your Money Loser's Grief!";
-			getitem 5021,1;
+		}
+	case 2:
+		if ((countitem(1059) > 149) && (countitem(907) > 99) && (countitem(978) > 0)) {
+			mes "[Isac Mari]";
+			mes "Parcel Hat seems to be useful for business people to carry around their products. If you brought everything I need, I will make it for you.";
+			mes "If you brought all the required items, I will make it for you~";
+			next;
+			mes "[Isac Mari]";
+			mes "But can you check that the items in your inventory aren't upgraded or have cards compounded into them? If any of the required items have forged upgrades or cards, those will be lost once I create the Parcel Hat.";
+			next;
+			mes "[Isac Mari]";
+			mes "It's better to keep only the items used to make the Parcel Hat in your inventory. Did you check? If so, let's get started.";
+			next;
+			switch(select("Give me a minute~!:Let's make the Parcel Hat.")) {
+			case 1:
+				mes "[Isac Mari]";
+				mes "Alright. Please check your items again. It's much better to be safe than sorry.";
+				close;
+			case 2:
+				mes "^3355FF*Thook Thook*";
+				mes "*Pop!*^000000";
+				next;
+				mes "[Isac Mari]";
+				mes "Oh...";
+				mes "I think I messed up!";
+				mes "No, wait, I think I can fix this...";
+				next;
+				delitem 1059,150;  //Transparent_Cloth
+				delitem 907,100;  //Resin
+				delitem 978,1;  //Cobaltblue_Dyestuffs
+				mes "[Isac Mari]";
+				mes "Well...";
+				mes "Um, it looks like a Parcel Hat. So that's good enough for me! Ha ha~";
+				getitem 5023,1; // Hat_Of_Bundle
+				close;
+			}
+		}
+		else {
+			mes "[Isac Mari]";
+			mes "I heard that around Alberta, Merchants are always selling goods from their carts in the middle of the streets.";
+			next;
+			mes "[Isac Mari]";
+			mes "But in the East side of the country, they use a different way to transfer goods.";
+			next;
+			mes "[Isac Mari]";
+			mes "Goods would be packed into a bundle and placed on top of the head so you wouldn't need to carry things by hand. But it's hard to keep your balance.";
+			next;
+			mes "[Isac Mari]";
+			mes "I'll need...";
+			mes "^3355FF150 Fabric^000000";
+			mes "^3355FF100 Resin^000000 and";
+			mes "^3355FF1 Cobaltblue Dyestuffs^000000";
+			mes "to make a Parcel Hat.";
+			next;
+			mes "[Isac Mari]";
+			mes "If you bring all the items then I will make it for you right away. See you later~!";
 			close;
-		sM_MakePhan:
-			if(countitem(2281)<1 || countitem(1048)<50) goto ssL_NoItems; 
-			delitem 2281,1;
-			delitem 1048, 50;
-			mes "[Mari Isac]";
-			mes "Here you go.  Enjoy your Phantom of the Opera Mask!";
-			getitem 5043, 1;
+		}
+	case 3:
+		if ((countitem(2233) > 0) && (countitem(614) > 0) && (countitem(916) > 79) && (countitem(999) > 19) && (countitem(938) > 799)) {
+			mes "[Isac Mari]";
+			mes "Grief for Greed...";
+			mes "If you brought all the required items, I'll go ahead and make it for you~";
+			next;
+			mes "[Isac Mari]";
+			mes "[Isac Mari]";
+			mes "But can you check that the items in your inventory aren't upgraded or have cards compounded into them? If any of the required items have forged upgrades or cards, those will be lost once I create the Money Loser's Grief.";
+			next;
+			mes "[Isac Mari]";
+			mes "It's better to keep only the items used to make the Grief for Greed in your inventory. Did you check? If so, let's get started.";
+			next;
+			switch(select("Give me a minute~!:Let's make the Grief for Greed.")) {
+			case 1:
+				mes "[Isac Mari]";
+				mes "Alright. Please check your items again. It's much better to be safe than sorry.";
+				close;
+			case 2:
+				mes "^3355FF*Thook Thook*";
+				mes "*Pop!*^000000";
+				next;
+				mes "[Isac Mari]";
+				mes "Whew! This is pretty hard!";
+				next;
+				delitem 2233,1;  //Circlet_
+				delitem 614,1;  //Gold
+				delitem 916,80;  //Feather
+				delitem 999,20;  //Steel
+				delitem 938,800;  //Sticky_Mucus
+				mes "[Isac Mari]";
+				mes "I might have made a few mistakes, but it looks good enough. Here you go, your own Grief for Greed hat!";
+				getitem 5021,1; // Bankruptcy_Of_Heart
+				close;
+			}
+		}
+		else {
+			mes "[Isac Mari]";
+			mes "Grief for Greed...";
+			mes "There's a tale of an honest Merchant that lived in Morroc long ago who had a quarrel with a bad guild.";
+			next;
+			mes "[Isac Mari]";
+			mes "Because the honest Merchant was not cheating people by his prices, his street stall was attacked by the bad guild and all his goods were taken.";
+			next;
+			mes "[Isac Mari]";
+			mes "So, the honest Merchant lost everything except some broken items. To express his sadness, he took these broken items and created this magnificent hat, the Grief for Greed.";
+			next;
+			mes "[Isac Mari]";
+			mes "This special hat appeals to people's sympathies, making them buy more goods to support the inner goodness of honest Merchants.";
+			next;
+			mes "[Isac Mari]";
+			mes "For this hat, I'll need...";
+			mes "^3355FF1 Slotted Circlet^000000";
+			mes "^3355FF1 Gold^000000";
+			mes "^3355FF20 Steel^000000";
+			mes "^3355FF80 Feather^000000";
+			mes "^3355FF800 Sticky Mucus^000000";
+			next;
+			mes "[Isac Mari]";
+			mes "If you bring all the items then I will make it for you right away. See you later~";
 			close;
-
-		ssL_NoItems:
-			mes "[Mari Isac]";
-			mes "You don't seem to have enough items for me to make that hat.  Please come back when you do.";
+		}
+	case 4:
+		if ((countitem(2281) > 0) && (countitem(1048) > 49)) {
+			mes "[Isac Mari]";
+			mes "Opera Phantom Mask...";
+			mes "Frightening, but also tragic and romantic. If you brought all the required items, I will make it for you~";
+			next;
+			mes "[Isac Mari]";
+			mes "But can you check that the items in your inventory aren't upgraded or have cards compounded into them? If any of the required items have forged upgrades or cards, those will be lost once I create the Opera Masque.";
+			next;
+			mes "[Isac Mari]";
+			mes "It's better to keep only the items used to make the Mine Hat in your inventory. Did you check? If so, let's get started.";
+			next;
+			switch(select("Give me a minute~!:Let's make the Opera Masque.")) {
+			case 1:
+				mes "[Isac Mari]";
+				mes "Alright. Please check your items again. It's much better to be safe than sorry.";
+				close;
+			case 2:
+				mes "^3355FF*Thook Thook*";
+				mes "*Pop!*^000000";
+				next;
+				mes "[Isac Mari]";
+				mes "Whew! This is pretty hard!";
+				next;
+				delitem 2281,1;  //Phantom_Of_Opera
+				delitem 1048,50;  //Slender_Snake
+				mes "[Isac Mari]";
+				mes "I'm not quite sure if this is the right one.";
+				mes "But it looks fine. Ha ha";
+				getitem 5043,1; // Opera_Ghost_Mask
+				close;
+			}
+		}
+		else {
+			mes "[Isac Mari]";
+			mes "Opera Phantom Mask...";
+			mes "Behind this mask is a story about a man's love and personal tragedy.";
+			next;
+			mes "[Isac Mari]";
+			mes "You may know him as the Phantom of the Opera. He was a musical genius that brought terror to the stage, because his scarred face forced him to live outside of society.";
+			next;
+			mes "[Isac Mari]";
+			mes "However, he fell in love with a beautiful singer and used his talents to propel her to new heights of fame. He finally revealed himself to her.";
+			next;
+			mes "[Isac Mari]";
+			mes "In the end...";
+			mes "She deeply cared for him, but was in love with another singer. The Phantom disappeared, perhaps to haunt some other place, and all that was left of him was his mask...";
+			next;
+			mes "[Isac Mari]";
+			mes "The mask that he was wearing is differently shaped that other opera masks, and was made to cover his particular facial scarring.";
+			next;
+			mes "[Isac Mari]";
+			mes "If you want to make Phantom of Opera. You will need:";
+			mes "^3355FF1 Opera Masque^000000";
+			mes "^3355FF50 Horrendous Hair^000000";
+			next;
+			mes "[Isac Mari]";
+			mes "If you bring all the items then I will make it for you right away. See you later~";
 			close;
+		}
+	}
 }
 
 // Doomed Swords - Comodo Portion. (Continued in Juno)
diff --git a/npc/quests/quests_geffen.txt b/npc/quests/quests_geffen.txt
index 76fadab8c..551b61be0 100644
--- a/npc/quests/quests_geffen.txt
+++ b/npc/quests/quests_geffen.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88 & Samuray22
 //===== Current Version: ===================================== 
-//= 1.3a
+//= 1.4
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -12,60 +12,73 @@
 //= 1.1 Fixed exploits [Lupus]
 //= 1.2 Removed Duplicates [Silent]
 //= 1.3 Updated "Welding Mask" Quest to the Official one. [Samuray22]
-//= 1.3a replaced item "names" with item id. Added missing [] [Lupus]
+//= 1.3a replaced item "names" with item id. Added missing [Lupus]
+//= 1.4 Updated welding mask and headset quests. [L0ne_W0lf]
 //============================================================ 
 
-
-
 //==============================================================================================//
 // 					Blacksmith: 'Welding Mask' Quest
 //==============================================================================================//
-geffen_in,144,166,5	script	Blacksmith	63,{
+geffen_in,144,166,4	script	Blacksmith	63,{
+	mes "[Blacksmith]";
+	mes "You've never heard of me? Why, I'm the Veteran Blacksmith of this land. I've spent 30 years in this hot and bloody hellfire, bending steel to my iron will!";
+	next;
 	mes "[Blacksmith]";
-	mes "I am the best Blacksmith! Do you know that?";
-	mes "I've been working for 30 years in this hot, bloody Hellfire!";
-	mes " I have been a Blacksmith for many years, I invented something really incredible. Wanna Know about it?";
+	mes "But...";
+	mes "I am growing older and my prowess begins to fade with age. So I've invented something for young, hot, upcoming Blacksmiths, in hopes that they too will master my craft...";
 	next;
-	switch( select( "Tip", "Not much help to me though...")) {
+	switch(select("What is it?:...")) {
 	case 1:
 		mes "[Blacksmith]";
-		mes "As Blacksmith, we melt steel into various metal product with incredible high temperature.";
-		mes "So we have to face the heat and metallic fluid all the time, our face are almost burnt down and sometimes injured during working... ";
-		mes "But with this new item... You don't have to worry any more. Introducing ^3355FF' Welding Mask '^000000 !!";
+		mes "We Blacksmiths must always manipulate steel under extreme heat, and the hot air and melted metals are more than most people can stand.";
+		next;
+		mes "[Blacksmith]";
+		mes "For the sake of our craft, our beautiful, yet masculine faces are put at risk...";
 		next;
 		mes "[Blacksmith]";
-		mes "It protect your face from the burning heat.";
-		mes "This is the most wanted item for anyone!";
-		mes "So? If you offer me  ^2244FF'50 Steel '^000000 and ^4422FF2000 Zeny^000000, I will make it for you right away!";
+		mes "But with this wonder of technology, there's no need to worry! Behold, the ^3355FFWelding Mask^000000 !!";
 		next;
-		switch( select( "Not bad! I will take one.", "It doesn't seem useful.")) {
-			case 1:
-				if (countitem(999) > 49 && Zeny > 1999) {
-					mes "[Blacksmith]";
-					mes "Great! I will do it right now!!";
-					next;
-					delitem 999, 50;
-					set Zeny, Zeny-2000;
-					getitem 2292, 1;
-					mes "[Blacksmith]";
-					mes "Now you can enjoy the heat!";
-					mes "Good bye...";
-					close;
-				}
-					mes "[Blacksmith]";
-					mes "Look! You don't have enough steel and zeny. I can't do it!";
-					mes "Do you know about alchemy? It is wHat you need now!";
-					mes "Find the steel and zeny quickly then you can do alchemy.";
-					close;
-			case 2:
+		mes "[Blacksmith]";
+		mes "It works by covering your face with a fat metal plate. Truly, it's an item that everyone should want! If not yourself, it'd be a good idea to give this to a friend who is studying smithing.";
+		next;
+		mes "[Blacksmith]";
+		mes "So how about it ? If you give me ^2244FF50 Steel^000000 and ^4422FFonly 2000 Zeny^000000, I will make it for you right away~!!";
+		next;
+		switch(select("Hm... Not bad. Alright.:How does it work again?")) {
+		case 1:
+			if ((countitem(999) > 49) && (Zeny > 1999)){
+				mes "[Blacksmith]";
+				mes "Ah, I see that you appreciate a Blacksmith's work! Alright, I'll do it right away !!";
+				next;
+				delitem 999,50;  //Steel
+				set Zeny,Zeny-2000;
+				getitem 2292,1; // Welding_Mask
 				mes "[Blacksmith]";
-				mes "Uh-uh... You don't know wHat you have missed!";
-				mes "Young man, you should take good care of your face before it gets shrinking.";
+				mes "Hahaha~! Make good use of that!";
 				close;
 			}
+			else {
+				mes "[Blacksmith]";
+				mes "Hmmm...";
+				mes "You do not have the items I require.";
+				next;
+				mes "[Blacksmith]";
+				mes "A common Blacksmith would interpret this as a sign of disrepect, but I will forgive you. Just don't forget what I need if you want me to make you this mask.";
+				close;
+			}
+		case 2:
+			mes "[Blacksmith]";
+			mes "The ^3355FFWelding Mask^000000 protects your face by covering it with a fat metal plate. This invention is the result of 30 years of endless toil at the hammer and anvil.";
+			close;
+		}
 	case 2:
 		mes "[Blacksmith]";
-		mes "Never mind... I am not ganna waste any more my time talking to you! Leave now! ";
+		mes "Ah...!";
+		mes "I guess this is the first time you've met a Blacksmith as great as me, and you're just speechless with awe. Please, take your time and speak up when you are ready.";
+		next;
+		mes "^3355FFThis guy seems";
+		mes "a little full";
+		mes "of himself.^000000";
 		close;
 	}
 }
@@ -77,98 +90,79 @@ geffen_in,144,166,5	script	Blacksmith	63,{
 //=============================================================================================//
 geffen_in,30,71,4	script	Eric	83,{
 	mes "[Eric]";
-	mes "Please listen to the story of my blessed grand father...";
-	emotion e_sob;
+	mes "Please listen";
+	mes "to my story";
+	mes "of my blessed";
+	mes "grandfather.";
 	next;
-	menu "Listen.",-, "Ask about Items needed.",M_Ask, "Make.",M_Make, "End Conversation.",M_End;
-
-		mes "[Eric]";
-		mes "My grand father passed away few years ago.... he was very special to me.....";
-		next;
-		mes "[Eric]";
-		mes "For as long as I can remember, he was always there for me.";
-		mes "He even took better care of me than did my own father, who was always busy with work.";
-		next;
-		mes "[Eric]";
-		mes "To me, my grand father's library was always like a 'Fairyland'.";
-		mes "I spent most of my time there and I learned a lot of things from his vast collection of books";
-		next;
-		mes "[Eric]";
-		mes "Grand father was interested in alchemy and music, so his library was filled with many books on these subjects.";
-		next;
+	switch(select("Talk:Ask about Items needed:Manufacture:Quit")) {
+	case 1:
 		mes "[Eric]";
-		mes "One day while I was in grand fathers library, I discovered an interesting design sheet.....";
-		mes "It was a design for what look liked 'Ear Muffs'.... underneath the drawing was a description that read:";
+		mes "My Grandfather, who passed away a few years ago, was special to me. He always stayed with me, and took care of me. He was much better than my old man, who was always busy working.";
 		next;
 		mes "[Eric]";
-		mes "'When worn on over the ears, anything from music to the faintest whispers can be heard.";
-		mes "The sounds are transmitted to the ears through a thin wire.  Project Name: ^5555FFHeadset^000000";
+		mes "To me, Grandfather's library was always like a fantasy land where I could escape. I spent most of my time there.";
 		next;
 		mes "[Eric]";
-		mes "It was a project that my grand father was working on before he passed away.... unfortunately he was never able to finish it.....";
+		mes "I learned a lot of things from his books in the Library. Grandfather was interested in Alchemy and Music, and his Library was filled with many mysterious old books.";
 		next;
 		mes "[Eric]";
-		mes "That's why I made up my mind to pick up where he left off and finish his beloved project!";
-		mes "I met with a few Alchemists and asked them to create a working prototype based on his plans.";
+		mes "One day...";
+		mes "As usual, I went to the Library and discovered an interesting schematic.";
 		next;
 		mes "[Eric]";
-		mes "But they were not able to understand my grand fathers concepts and therefore could not help me.";
+		mes "It showed some instrument which looked like Ear Muffs that, when worn on the head, could transmit music or whispers to the ears through a thin wire.";
 		next;
 		mes "[Eric]";
-		mes "Even so I did not give up and decided to make it myself.  So I studied and researched for many years....";
-		mes "And now I have a full working knowledge of my grand fathers invention, the ^5555FFHeadset^000000!!";
+		mes "I guess...";
+		mes "It is my grand father's unfinished work. I met a few Alchemists and asked them to produce it, but they rejected my offer...";
 		next;
 		mes "[Eric]";
-		mes "Yet there is still one obsticale that is keeping me from making it.... I do not have the materials necessary to make my grand fathers invention!";
+		mes "In the end, I thought 'I've gotta make it myself.' So I researched for a few years, and now I fully understand how to make that thing. But, I could never gather the materials to make it!";
 		next;
 		mes "[Eric]";
-		mes "My only goal in life is to realize my grand fathers ideas and pay tribute to the man I hold so dear to my heart.......";
-		emotion e_sob;
+		mes "If I can get those articles, I would build it right away. If you are interested in my idea, would you bring them for me?";
 		next;
 		mes "[Eric]";
-		mes "If only I had those materials.... Hmm... would you be iterested in this project? All I ask is that you gather the right items for me....";
-		emotion e_hmm;
+		mes "All I wanna do is build this thing in honor of my grandfather and finish the work he started. If you ask me to keep it, I wouldn't mind.";
 		close;
-
-	M_Ask:
-		mes "[Eric]";
-		mes "These are items needed for grand father's Headset:";
-		mes "^3355FFSteel^000000 ^FF555540^000000";
-		mes "^3355FFOridecon^000000 ^FF55551^000000";
-		mes "^3355FFAlcohol^000000 ^FF55551^000000";
-		mes "^3355FFCoal^000000 ^FF55551^000000";
-		close;
-
-	M_Make:
-		mes "[Eric]";
-		if(countitem(999) < 40 || countitem(984) < 1 || countitem(970)<1 || countitem(1003) < 1) goto L_NotEnuf;
-		delitem 999,40;
-		delitem 984,1;
-		delitem 970,1;
-		delitem 1003,1;
-		mes "Oh this is GREAT!! You have all of the materials I need to make my grandfather's Headset!";
-		emotion e_ic;
-		next;
-		mes "[Eric]";
-		mes "Give me a few minutes to assemble it...............";
-		next;
-		getitem 5001,1;
-		mes "[Eric]";
-		mes "FINALLY!! It's complete! My grand father's Headset! Please take them... without your help this wouldn't have been possible.";
-		emotion e_gasp;
-		next;
+	case 2:
 		mes "[Eric]";
-		mes "Thank so very much! Because of you, I could fullfill my grand father's wish.  I just know he's smiling down on me from Heaven.....";
-		emotion e_thx;
+		mes "40 ^3355FFSteel^000000";
+		mes "1 ^3355FFOridecon^000000";
+		mes "1 ^3355FFAlcohol^000000";
+		mes "1 ^3355FFCoal^000000";
+		mes "These are the things I need for Grandfather's masterpiece.";
 		close;
-
-		L_NotEnuf:
-			mes "Thank you for trying to help me but..... you don't seem to have all of the items I need.....";
-			emotion e_swt;
+	case 3:
+		if ((countitem(999) > 39) && (countitem(615) > 0) && (countitem(970) > 0) && (countitem(1003) > 0)) {
+			delitem 999,40;  //Steel
+			delitem 615,1;  //Oridecon
+			delitem 970,1;  //Alchol
+			delitem 1003,1;  //Coal
+			getitem 5001,1; // Headset
+			mes "*Tap! Tap! Tap!*";
+			next;
+			mes "[Eric]";
+			mes "Thank you.";
+			mes "Because of you, I could accomplish my grandfather's wish. He would be happy if he looked down on me from Heaven.";
+			next;
+			mes "[Eric]";
+			mes "As I said, please take this. I am just proud that I can make this by myself.";
 			close;
-	M_End:
-		mes "[Eric]";
-		mes "Farewell..... boo hoo....";
-		emotion e_sob;
+		}
+		else {
+			mes "[Eric]";
+			mes "Thank you for trying to help me, but you didn't bring all the items I need. I think you will find them all soon though.";
+			close;
+		}
+	case 4:
+		mes "[Eric]";
+		mes "N-no?";
+		mes "Well...";
+		mes "You have your own";
+		mes "worries, I suppose.";
+		mes "Farewell.";
 		close;
+	}
 }
diff --git a/npc/quests/quests_lutie.txt b/npc/quests/quests_lutie.txt
index 758687508..62f20de6b 100644
--- a/npc/quests/quests_lutie.txt
+++ b/npc/quests/quests_lutie.txt
@@ -15,344 +15,344 @@
 //= 1.3 Update NPC to the Official One. [Samuray22]
 //= 1.3a Changed item names to item IDs. [Samuray22]
 //= 1.3b Removed a scrap " left in a delitem. [L0ne_W0lf]
+//= 1.4 Updated NPCs once again. [L0ne_W0lf]
 //============================================================ 
 
-xmas,117,295,3	script	Vending Machine Man	704,{
+xmas,117,295,4	script	Vending Machine Man	704,{
 	mes "[Titicupe]";
-	mes "Ha ha ha ha ha ha";
-	mes "..You arrived";
-	mes "I'm a manager";
-	mes "of toy factory!!";
-	mes "I've opened my eyes";
-	mes "on new business!";
+	mes "Hmm...?";
+	mes "I, Titicupe, esteemed manager of the Toy Factory and genius inventor, has done it again! I've just created the world's most sophisticated vending machine!";
 	next;
-	switch(select( "Talk to him about the vending machine", "Items in the vending machine", "Stop talking")) {
+	switch(select("Talk to him about the Vending Machine:Items in the Vending Machine:Stop talking")) {
 	case 1:
 		mes "[Titicupe]";
-		mes "Can you see a little snowman";
-		mes "left side of me. can you?";
-		mes "If you look at his mouth cautiously";
-		mes "you can find out";
-		mes "that it was builted to";
-		mes "huge size as it can";
+		mes "Can you see the little snowman to the left side of me? Can you? If you look at his mouth closely, you'll see that it's been built quite largely. You might say, a bit too large for normal purposes...";
 		next;
 		mes "[Titicupe]";
-		mes "swallow any thing.";
-		mes ".. feel bad hah?";
-		mes "Try to put your";
-		mes "hand,legs,and even your head inside.";
-		mes "Everything goes in.";
-		mes "Hohoho . However";
+		mes "You see, that snowman is actually an amazing vending machine that I invented out of my blood, sweat, tears and snow.";
 		next;
 		mes "[Titicupe]";
-		mes "this is a";
-		mes "vending machine";
-		mes "which is you can get";
-		mes "fashionable decorating item.";
-		mes "You have to provide";
-		mes "some items when you want to get.";
+		mes "You can put all sorts of things inside its mouth, and if you insert the right items, you'll get some hats in return...";
 		next;
 		mes "[Titicupe]";
-		mes "Pour out to snowman's mouth!!";
-		mes "If you do that";
-		mes "You can get";
-		mes "fancy items wHat";
-		mes "you dreamed for";
-		mes "Ha ha ha ha ha~~~";
+		mes "Fashionable hats that you've always dreamed of wearing...! Bwahahahaha~!";
 		next;
-		goto L_end2;
+		mes "[Titicupe]";
+		mes "Oh, this creation of mine is so magnificent!";
+		Emotion e_kis2;
+		next;
+		mes "[Titicupe]";
+		mes "And the headgears--! I... I can't contain myself!";
+		next;
+		mes "^3355FFToy factory manager Titicupe jumps and convulses with joy. Clearly he's insane, but it may be possible that he may be brilliant.^000000";
+		Emotion e_gasp;
+		close;
 	case 2:
 		mes "[Titicupe]";
-		mes "Ho ho ho ho~";
-		mes "Do you have";
-		mes "any question?";
-		mes "then ask me";
-		mes "I'm genius.ha ha~";
+		mes "Oh right! You need to know what kind of items to put into the Vending Machine to get what you want, yes? Go ahead... Ask me~";
+		Emotion e_ic;
 		next;
-		switch( select( "Raccoon Hat", "Spore Hat", "Wonder Nutshell", "Rainbow Egg Shell", "Blush", "Chef Hat", "Candle", "Cake Hat", "Stop talking")) {
+		switch(select("Raccoon Hat:Spore Hat:Wonder Nutshell:Ranbow Eggshell:Blush:Chef Hat:Candle:Cake Hat:End Conversation")) {
 		case 1:
 			mes "[Titicupe]";
-			mes "Raccoon Hat ?";
-			mes "Kitty Band 1";
-			mes "Dragon Scale 20";
-			mes "Tough Scalelike stem 200";
-			mes "Sea-Otter Fur 300";
-			goto L_end;
+			mes "Raccoon Hat?";
+			mes "1 Kitty Band";
+			mes "20 Dragon Scale";
+			mes "200 Tough Scalelike Stem";
+			mes "300 Sea-otter Fur";
+			break;
 		case 2:
 			mes "[Titicupe]";
-			mes "Spore Hat ?";
-			mes "Poison Spore 850";
-			mes "Burnt Tree 300";
-			mes "Long Tongue 1";
-			goto L_end;
+			mes "Spore Hat?";
+			mes "850 Poison Spore";
+			mes "300 Burnt Tree";
+			mes "1 Tongue";
+			break;
 		case 3:
 			mes "[Titicupe]";
-			mes "Wonder Nutshell ?";
-			mes "Fruit Shell 1";
-			mes "Wing of Dragonfly 500";
-			goto L_end;
+			mes "Wonder Nutshell?";
+			mes "1 Nut Shell";
+			mes "500 Wing of Dragonfly";
+			break;
 		case 4:
 			mes "[Titicupe]";
-			mes "Rainbow Egg Shell ?";
-			mes "Egg Shell 1";
-			mes "Cobaltblue Dyestuffs 1";
-			mes "Claw Of Desert Wolf 50";
-			goto L_end;
+			mes "Rainbow Eggshell?";
+			mes "1 Egg Shell";
+			mes "1 Cobaltblue Dyestuffs";
+			mes "50 Claw of Desert Wolf";
+			break;
 		case 5:
 			mes "[Titicupe]";
-			mes "Blush ?!";
-			mes "You !";
-			mes "You know something ha ha ?!";
-			mes "he he . anyway";
-			mes "- Alice's Apron 100 -";
-			goto L_end;
+			mes "Blush?!";
+			mes "You!";
+			mes "You know something...";
+			mes "Heh heh~ Anyway";
+			mes "100 Alice's Apron";
+			break;
 		case 6:
 			mes "[Titicupe]";
-			mes "Chef Hat ?";
-			mes "Piece Of Cake 120";
-			mes "White Dyestuffs 1";
-			mes "Feather 330";
-			mes "Dragon Scale 450";
-			goto L_end;
+			mes "Chef Hat?";
+			mes "120 Piece of Cake";
+			mes "1 White Dyestuffs";
+			mes "330 Feather";
+			mes "450 Dragon Scale";
+			break;
 		case 7:
 			mes "[Titicupe]";
-			mes "Candle ?";
-			mes "Bomb Wick 1";
-			mes "Matchstick 50";
-			mes "Royal Jelly 100";
-			goto L_end;
+			mes "Candle?";
+			mes "1 Bomb Wick";
+			mes "50 Matchstick";
+			mes "100 Royal Jelly";
+			break;
 		case 8:
 			mes "[Titicupe]";
-			mes "Cake Hat ?";
-			mes "Candy 10";
-			mes "Candy Cane 5";
-			mes "Well Baked Cookie 15";
-			mes "Piece Of Cake 20";
-			mes "steel 10";
-			goto L_end;
+			mes "Cake Hat?";
+			mes "10 Candy";
+			mes "5 Candy Cane";
+			mes "15 Well-baked Cookie";
+			mes "20 Piece Of Cake";
+			mes "10 Steel";
+			break;
 		case 9:
 			mes "[Titicupe]";
-			mes "Ask me any time";
-			mes " Actually you know?";
-			mes "'Genius' knows everything ";
-			mes "My brain is number one";
-			mes "in the whole universe!";
-			mes "Just So Goooooood!";
-			goto L_end;
+			mes "Ask me anytime. Those kinds of questions are no problem for geniuses like me!";
 		}
+		next;
+		mes "[Titicupe]";
+		mes "So happy!!";
+		mes "I'm a genius~!";
+		mes "Ho ho ho";
+		mes "Ho ho ho ho!";
+		close;
 	case 3:
-		goto L_end2;
+		mes "[Titicupe]";
+		mes "Sometimes, I can't believe how magnificent this invention of mine is...!";
+		next;
+		mes "[Titicupe]";
+		mes "I...";
+		mes "I love you";
+		mes "Mister Snowman";
+		mes "Vending Machine.";
+		Emotion e_kis2;
+		next;
+		mes "^3355FFToy factory manager Titicupe begins to jump around and emit screams of unbridled ecstacy. At this point, it's not difficult to doubt his sanity, as well as his genius.";
+		close;
 	}
-
-L_end:
-	next;
-	mes "[Titicupe]";
-	mes "So happy!!";
-	mes "I'm a genius";
-	mes "Ho ho ho";
-	mes "Ho ho ho ho";
-	close;
-L_end2:
-	mes "[Titicupe]";
-	mes "I'm a genius!!";
-	mes "The world will suprise!";
-	mes "for my magnificient creation";
-	mes "of these beautiful";
-	mes "and so cool items";
-	mes "Ke-ke-ke";
-	next;
-	mes "- Toy factory manager -";
-	mes "- Titicupe is jumping -";
-	mes "- around and pointing -";
-	mes "- the vending machine -";
-	mes "- snowman with very -";
-	mes "- uproarious attitude-";
-	mes "- and he looks very very happy -";
-	close;
 }
 
-xmas,115,297,3	script	Vending Machine	111,{
+xmas,115,297,4	script	Vending Machine	111,{
 	mes "[Audi]";
-	mes "- Exciting item vending machine. -";
-	mes "- Thanks to find Audi. -";
-	mes "- Select a item that you want -";
-	mes "- and -";
-	mes "- Put required item to -";
-	mes "- my mouth. -";
+	mes "^555555Exciting item vending machine. Invented by great Titicupe. Select the desired item and place required items into snowmouth receptacle.^000000";
 	next;
-	switch( select( "^FF3355- notice (must read) -^000000", "Raccoon Hat", "Spore Hat", "Wonder Nutshell", "Rainbow Egg Shell", "Blush", "Hat Of Cooker", "Candle", "Cake Hat", "Cancel")) {
+	switch(select("^FF3355Notice (Must Read)^000000:Raccoon Hat:Spore Hat:Wonder Nutshell:Rainbow Eggshell:Blush:Chef Hat:Candle:Cake Hat:Cancel")) {
 	case 1:
 		mes "[Audi]";
 		mes "Hi~ !";
-		mes "I need to tell you";
-		mes "one important thing";
-		mes "This vending mashine is";
-		mes "not equipted to differentiate";
-		mes "special items and ordinary item";
-		next;
-		mes "[Audi]";
-		mes "So If you use item that";
-		mes "^FF3355already applied valuable";
-		mes "Monster card in it^000000 or";
+		mes "I need to tell you one important thing. This vending machine is not equipped to differentiate between special items and ordinary items.";
 		next;
 		mes "[Audi]";
-		mes "^FF3355high level of";
-		mes "forged items^000000 will";
-		mes "^3355FFtreated as normal";
-		mes "item^000000 so. When you";
-		mes "try to exchange + generate item";
-		mes "Please put away valiable items";
+		mes "So if you use an item that has been ^FF3355upgraded, or has a card compounded to it^000000, any cards or upgrades will be lost in creating the new item.";
 		next;
 		mes "[Audi]";
-		mes "to Kafre warehouse";
-		mes "or seperate from";
-		mes "your body.";
-		mes "This is very important.";
-		mes "Because if when you use";
-		mes "this vending machine and";
+		mes "So when you try to exchange and generate items, please put all the valuable items you won't be using into the Kafra Storage.";
 		next;
 		mes "[Audi]";
-		mes "your valiable items";
-		mes "have used by vending machine.";
-		mes "There will be no";
-		mes "refund and recover";
-		mes "to that item.";
+		mes "Please keep this in mind because this Vending Machine does not provide any returns, refunds or exchanges.";
 		next;
 		mes "[Audi]";
-		mes "Have a good time";
-		mes "Thank you";
+		mes "Have a great time!";
+		mes "Thank you!";
 		close;
 	case 2:
-		if (countitem(2213) > 0 && countitem(1036) > 19 && countitem(7012) > 199 && countitem(7065) > 299) {
-			callfunc "Vending Machine","good";
+		if ((countitem(2213) > 0) && (countitem(1036) > 19) && (countitem(7012) > 199) && (countitem(7065) > 299)) {
+			mes "^3355FFYou gingerly place the items into the snowman's mouth.^000000";
 			next;
-			delitem 2213, 1; //Kitty Band
-			delitem 1036, 20; //Dragon Scale 
-			delitem 7012, 200; //Tough Scalelike Stem
-			delitem 7065, 300; //Sea-Otter Fur
-			getitem 5033, 1; //Raccoon Hat
-			callfunc "Vending Machine","finish";
+			delitem 2213,1;  //Cat_Hairband
+			delitem 1036,20;  //Dragon_Scale
+			delitem 7012,200;  //Tough_Scalelike_Stem
+			delitem 7065,300;  //Sea_Otter_Leather
+			Emotion e_Oh;
+			mes "^3355FF*Vroooooom~~*";
+			mes "*Bzzzzzt*";
+			mes "*choogachooga*";
+			mes "*Kapang!*^000000";
+			getitem 5033,1; // Smokie_Hat
+			next;
+			mes "[Audi]";
+			mes "^555555Thank you for coming by.";
+			mes "Please come again!";
+			mes "Oh, and tell a friend!^000000";
+			close;
 		}
-			callfunc "Vending Machine","bad";
+		break;
 	case 3:
-		if (countitem(7033) > 849 && countitem(7068) > 299 && countitem(1015) > 0) {
-			callfunc "Vending Machine","good";
+		if ((countitem(4048) > 849) && (countitem(7068) > 299) && (countitem(1015) > 0)) {
+			mes "^3355FFYou gingerly place the items into the snowman's mouth.^000000";
+			next;
+			delitem 4048,850;  //Poison_Spore
+			delitem 7068,300;  //Burn_Tree
+			delitem 1015,1;  //Thin_N'_Long_Tongue
+			Emotion e_oh;
+			mes "^3355FF*Vroooooom~~*";
+			mes "*Bzzzzzt*";
+			mes "*choogachooga*";
+			mes "*Kapang!*";
+			mes "*Wek Wek*^000000";
+			getitem 5029,1; // Spore_Hat
 			next;
-			delitem 7033, 850; //Poison Spore
-			delitem 7068, 300; //Burnt Tree
-			delitem 1015, 1; //Tongue
-			getitem 5029, 1; //Spore Hat
-			callfunc "Vending Machine","finish";
+			mes "^555555Thank you for coming by.";
+			mes "Please come again!";
+			mes "Oh, and tell a friend!^000000";
+			close;
 		}
-			callfunc "Vending Machine","bad";
+		break;
 	case 4:
-		if (countitem(5037) > 0 && countitem(7064) > 499) {
-			callfunc "Vending Machine","good";
+		if ((countitem(5037) > 0) && (countitem(7064) > 499)) {
+			mes "^3355FFYou gingerly place the items into the snowman's mouth.^000000";
+			next;
+			delitem 5037,1;  //Fruit_Shell
+			delitem 7064,500;  //Dragon_Fly_Wing
+			mes "^3355FF*Vroooooom~~*";
+			mes "*Bzzzzzt*";
+			mes "*choogachooga*";
+			mes "*Kapang!*";
+			mes "*BeepBoopBeepBoop*";
+			mes "*Beeeeeeoop*^000000";
+			Emotion e_oh;
+			getitem 5050,1; // Mystery_Fruit_Shell
 			next;
-			delitem 5037, 1; //Nutshell
-			delitem 7064, 500; //Wing of Dragonfly
-			getitem 5050, 1; //Wonder Nutshell
-			callfunc "Vending Machine","finish";
+			mes "[Audi]";
+			mes "^555555Thank you for coming by.";
+			mes "Please come again!";
+			mes "Oh, and tell a friend!^000000";
+			close;
 		}
-			callfunc "Vending Machine","bad";
+		break;
 	case 5:
-		if (countitem(5015) > 0 && countitem(978) > 0 && countitem(7030) > 49) {
-			callfunc "Vending Machine","good";
+		if ((countitem(5015) > 0) && (countitem(978) > 0) && (countitem(7030) > 49)){ 
+			mes "^3355FFYou gingerly place the items into the snowman's mouth.^000000";
 			next;
-			delitem 5015, 1; //Egg Shell
-			delitem 978, 1; //Cobaltblue Dyestuff
-			delitem 7030, 50; //Claw of Desert Wolf
-			getitem 5039, 1; //Rainbow Eggshell
-			callfunc "Vending Machine","finish";
+			delitem 5015,1;  //Egg_Shell
+			delitem 978,1;  //Cobaltblue_Dyestuffs
+			delitem 7030,50;  //Claw_Of_Desert_Wolf
+			Emotion e_oh;
+			mes "^3355FF*Vroooooom~~*";
+			mes "*Bzzzzzt*";
+			mes "*choogachooga*";
+			mes "*OoooEeeeeeee~*^000000";
+			getitem 5039,1; // Mottled_Egg_Shell
+			next;
+			mes "[Audi]";
+			mes "^555555Thank you for coming by.";
+			mes "Please come again!";
+			mes "Oh, and tell a friend!^000000";
+			close;
 		}
-			callfunc "Vending Machine","bad";
+		break;
 	case 6:
 		if (countitem(7047) > 99) {
-			callfunc "Vending Machine","good";
+			mes "^3355FFYou gingerly place all 100 Aprons into the snowman's mouth.^000000";
+			next;
+			delitem 7047,100;  //Alice's_Apron
+			Emotion e_oh;
+			mes "^3355FF*Vroooooom~~*";
+			mes "*Bzzzzzt*";
+			mes "*choogachooga*";
+			mes "*Kapang!*";
+			mes "*ChoopChoop*";
+			mes "*Chaaawah!*^000000";
+			getitem 5040,1; // Blush
+			mes "[Audi]";
+			mes "^555555Thank you for coming by.";
+			mes "Please come again!";
+			mes "Oh, and tell a friend!^000000";
 			next;
-			delitem 7047, 100; //Alice's Apron
-			getitem 5040, 1; //Blush
-			callfunc "Vending Machine","finish";
+			mes "[Titicupe]";
+			mes "You got Blush?! Huh. I guess you really like looking glamourous~! I bet you really appreciate my genius now, huh?";
+			close;
 		}
-			callfunc "Vending Machine","bad";
+		break;
 	case 7:
-		if (countitem(539) > 119 && countitem(982) > 0 && countitem(949) > 329 && countitem(1036) > 449) {
-			callfunc "Vending Machine","good";
+		if ((countitem(539) > 119) && (countitem(982) > 0) && (countitem(916) > 329) && (countitem(1036) > 449)) {
+			mes "^3355FFYou gingerly place the items into the snowman's mouth.^000000";
 			next;
-			delitem 539, 120; //Piece of Cake
-			delitem 982, 1; //White Dyestuff
-			delitem 949, 330; //Feather
-			delitem 1036, 450; //Dragon Scale
-			getitem 5026, 1; //Chef Hat
-			callfunc "Vending Machine","finish";
+			delitem 539,120;  //Piece_Of_Cake
+			delitem 982,1;  //White_Dyestuffs
+			delitem 916,330;  //Feather
+			delitem 1036,450;  //Dragon_Scale
+			Emotion e_oh;
+			mes "^3355FF*Vroooooom~~*";
+			mes "*Bzzzzzt*";
+			mes "*choogachooga*";
+			mes "*Kapang!*";
+			mes "*Muuuuuuugeeee*^000000";
+			getitem 5026,1; // Hat_Of_Cook
+			next;
+			mes "[Audi]";
+			mes "^555555Thank you for coming by.";
+			mes "Please come again!";
+			mes "Oh, and tell a friend!^000000";
+			close;
 		}
-			callfunc "Vending Machine","bad";
+		break;
 	case 8:
-		if (countitem(2279) > 0 && countitem(7035) > 49 && countitem(526) > 99) {
-			callfunc "Vending Machine","good";
+		if ((countitem(2279) > 0) && (countitem(7035) > 49) && (countitem(526) > 99)) {
+			mes "^3355FFYou gingerly place the items into the snowman's mouth.^000000";
+			next;
+			delitem 2279,1;  //Bomb_Wick
+			delitem 7035,50;  //Matchstick
+			delitem 526,100;  //Royal_Jelly
+			Emotion e_oh;
+			mes "^3355FF*Vroooooom~~*";
+			mes "*Bzzzzzt*";
+			mes "*choogachooga*";
+			mes "*Kapang!*^000000";
+			getitem 5028,1; // Candle
 			next;
-			delitem 2279, 1; //Bomb Wick
-			delitem 7035, 50; //Matchstick
-			delitem 526, 100; //Royal Jelly
-			getitem 5028, 1; //Candle
-			callfunc "Vending Machine","finish";
+			mes "[Audi]";
+			mes "^555555Thank you for coming by.";
+			mes "Please come again!";
+			mes "Oh, and tell a friend!^000000";
+			close;
 		}
-			callfunc "Vending Machine","bad";
+		break;
 	case 9:
-		if (countitem(529) > 9 && countitem(530) > 4 && countitem(538) > 14 && countitem(539) > 19 && countitem(999) > 9) {
-			callfunc "Vending Machine","good";
+		if ((countitem(529) > 9) && (countitem(530) > 4) && (countitem(538) > 14) && (countitem(539) > 19) && (countitem(999) > 9)) { 
+			mes "^3355FFYou gingerly place the items into the snowman's mouth.^000000";
+			next;
+			delitem 529,10;  //Candy
+			delitem 530,5;  //Candy_Striper
+			delitem 538,15;  //Well_Baked_Cookie
+			delitem 539,20;  //Piece_Of_Cake
+			delitem 999,10;  //Steel
+			Emotion e_oh;
+			mes "^3355FF*Vroooooom~~*";
+			mes "*Bzzzzzt*";
+			mes "*choogachooga*";
+			mes "*Kapang!*^000000";
+			getitem 5024,1; // Hat_Of_Cake
 			next;
-			delitem 529, 10; //Candy
-			delitem 530, 5; //Candy Cane
-			delitem 538, 15; //Well-baked Cookie
-			delitem 539, 20; //Piece of Cake
-			delitem 999, 10; //Steel
-			getitem 5024, 1; //Cake Hat
-			callfunc "Vending Machine","finish";
+			mes "[Audi]";
+			mes "^555555Thank you for coming by.";
+			mes "Please come again!";
+			mes "Oh, and tell a friend!^000000";
+			close;
 		}
-			callfunc "Vending Machine","bad";
+		break;
 	case 10:
 		mes "[Audi]";
-		mes "- Thank you so much -";
-		mes "- for use me -";
-		mes "- . . . . . -";
-		mes "- But you didn't use";
-		mes "- anything. hummmmm-";
-		mes "- Well see you again ! -";
-		close;
-	}
-}
-
-function	script	Vending Machine	{
-	if(getarg(0) == "good") {
-		mes "- You put items -";
-		mes "- that is required to -";
-		mes "- generate new item, -";
-		mes "- inside of me. hehe -";
-		return;
-	} else if(getarg(0) == "bad") {
-		mes "[Audi]";
-		mes "- Piiiiii !! -";
-		mes "- Ups ! Ups ! -";
-		mes "- lack of items -";
-		mes "- Ups ! Ups ! -";
-		mes "Don't think I'm fool.";
+		mes "^555555Please...";
+		mes "Insert...";
+		mes "Items.^000000";
 		close;
 	}
-		mes "[Audi]";
-		mes "- broook boom -";
-		mes "- boooom!! -";
-		mes "- weck weck !! -";
-		mes "- boom!! -";
-		mes "- ugh ! -";
-		if(countitem(5040) > 0) {
-			mes "- Wow . Blush !! -";
-			mes "- You are so cool -";
-			mes "- you know real fashion ! -";
-			mes "- ah so cute Blush -";
-			mes "- Wanna touch .. -";
-		}
-		mes "- Thanks for use! -";
-		close;
+	Emotion e_x;
+	mes "[Audi]";
+	mes "^555555Error Error!";
+	mes "Incorrect items!^000000";
+	next;
+	mes "[Titicupe]";
+	mes "I...";
+	mes "I guess a lot of people would do anything to get their hands on some Blush.";
+	close;
 }
-
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 94cd2aa86..501e61b2a 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 2.1
+//= 2.2
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -23,121 +23,124 @@
 //= 2.0 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 2.0a Corrected a Typo error ";;". [Samuray22]
 //= 2.1 Assassins will now get their request item. (bugreport:1220) [L0ne_W0lf]
+//= 2.2 Updated Binocular and Stop Post quests. [L0ne_W0lf]
 //============================================================ 
 
-
-
 //==================================================================================//
 // 				Stop Post Quest
 //==================================================================================//
-morocc_in,142,100,4	script	Pierce	89,{
-	mes "[Pierce]";
-	mes "Welcome to the most famous shop for ^3355FF'Stop Post'^000000... the Brosnan's";
+morocc_in,142,100,4	script	William	89,{
+	mes "[William]";
+	mes "Welcome to";
+	mes "MacMillan's ^3355FFPost^000000 Workshop.";
 	next;
-	mes "[Pierce]";
-	mes "Have you heard about our family?";
-	mes "We have been producing traffic signs for 250 years when people were still traveling by carriage.";
-	mes "And I have been getting many orders for ^3355FF'Stop Post'^000000 recently. It is in fashion now as accessories.";
+	mes "[William]";
+	mes "My family, the MacMillan Clan, has been producing Professional Traffic Signal Posts for more than 250 years. Nowadays, we are booking Special Orders for our unique ornament, ^3355FFStop Post^000000.";
 	next;
-	switch( select( "Order ^3355FF' Stop Post '^000000.","End conversation.")) {
+	switch(select("Could I order one ^3355FFStop Post^000000?:Nah...")) {
 	case 1:
-		mes "[Pierce]";
-		mes "Accessories made from the famous ^3355FF'Stop Post'^000000 by a family of 250 years old...";
-		mes "With our years of experience in traffic signs, we guarantee you the long lasting usage.";
-		mes "Satisfaction guarantee for all customers!";
-		next;
-		mes "[Pierce]";
-		mes "For producing ^3355FF'Stop Post'^000000, we need ^3355FF' 91100 Zeny '^000000";
-		mes "And 50 ^3355FF' Trunk '^000000 and one ^3355FF' Black Dyestuffs'^000000.";
-		next;
-		if(countitem(1019) > 49 && countitem(983) > 0 && Zeny > 91099) {
-			delitem 1019,50;
-			delitem 983,1;
+		mes "[William]";
+		mes "This unique ornament, ^3355FFStop Post^000000, is a traffic signal on the road, and doubles as a hair ornament! This, we solemnly promise on the strength of a 100-year guarantee.";
+		next;
+		mes "[William]";
+		mes "To produce a ^3355FFStop Post^000000, we need ^3355FF91100 Zeny^000000, ^3355FF50 Trunk^000000 and ^3355FF1 Black Dyestuffs^000000.";
+		next;
+		if ((countitem(1019) > 49) && (countitem(983) > 0) && (Zeny > 91099)) {
+			delitem 1019,50;  //Wooden_Block
+			delitem 983,1;  //Black_Dyestuffs
 			set Zeny,Zeny-91100;
-			mes "[Pierce]";
-			mes "Alright! This is the famous ^3355FF'Stop Post '^000000 of 250 years history!";
-			mes "Thank you for shopping here! See you soon!";
-			getitem 2272,1;
+			mes "[William]";
+			mes "Here you are~!";
+			mes "This ^3355FFStop Post^000000 has";
+			mes "been especially made";
+			mes "just for you!";
+			mes "Thank you for stopping by!";
+			mes "...Get the joke?";
+			getitem 2272,1; // Stop_Post
 			close;
 		}
-			mes "[Pierce]";
-			mes "You don't have enough items...";
-			mes "Please check it again!";
+		else {
+			mes "[William]";
+			mes "So...";
+			mes "When you get those items, swing on by and we'll give you a Stop Post.";
 			close;
+		}
 	case 2:
-		mes "[Pierce]";
-		mes "Thank you for shopping at the Brosnan's.";
-		mes "All the best to you!";
+		mes "[William]";
+		mes "Anyway, thank you for coming by 'MacMillan's Workshop.' But think about buying something next time, will ya?";
 		close;
 	}
 }
 
-
 //==================================================================================//
 //				Binoculars Quest
 //==================================================================================//
-morocc_in,76,163,4	script	Marius#binos	64,5,5,{
+morocc_in,76,163,4	script	Alchemist	64,{
 	mes "[Marius]";
-	mes "Ha! Ha! Ha! Another customer coming!";
-	mes "I know what you are gonna say.";
-	mes "You are here for the magic glasses, right?";
+	mes "Howdy, new customer!!";
+	mes "I know what you're gonna talk about. You want the Magic Glasses from me, riiiiight?";
 	next;
-	switch(select( "What is magic glasses?","Making magic glasses.","Skip.")) {
+	switch(select("What is that?:Manufacture:Ignore him")) {
 	case 1:
 		mes "[Marius]";
-		mes "Right! Its proper name is ' ^3355FFBinoculars^000000 '!";
-		mes "It is like a cylinder with...";
-		mes "A lot of lens piled together inside!";
-		mes "Using the effect of light reflection...";
-		mes "To see something far away.";
-		mes "It is not for something near to you!";
+		mes "Hmm~!";
+		mes "Well, the official name for them is ^3355FFBinoculars^000000! An optical device that works like a pair of field glasses, they're designed for simultaneous use by both eyes!";
 		next;
 		mes "[Marius]";
-		mes "WHat do you think? Is it great?";
-		mes "Ha! Ha! Ha!";
-		mes ".........";
-		mes "... WHat? You don't look convinced!";
-		mes "I am telling the truth!!";
+		mes "They're made up of two small telescopes joined with a single focusing device. You can arrange the lenses to produce stereoscopic vision.";
 		next;
 		mes "[Marius]";
-		mes "Mark down the items you need to make a Binoculars.";
-		mes "One by one...";
-		mes "One ^3355FFGeek Glasses^000000! 100 ^3355FFSteel^000000! And ^3355FF50.000 Zeny^000000!";
+		mes "So?";
+		mes "Ain't that";
+		mes "something, huh?";
+		mes "Muhahahahahaha!";
+		mes ". . . . .";
+		next;
+		mes "[Marius]";
+		mes "Hm? You don't seem to";
+		mes "believe what I just said?";
+		mes "Oh c'mon, jerk. It's real!!";
+		next;
+		mes "[Marius]";
+		mes "I will let you";
+		mes "know the items I need...";
+		mes "1 ^3355FFGeek Glasses^000000! 100 ^3355FFSteel^000000!";
+		mes "And ^3355FF50000 Zeny^000000!";
 		close;
 	case 2:
-		if (countitem(2243) > 0 && countitem(999) > 99 && Zeny > 49999) {
+		if ((countitem(2243) > 0) && (countitem(999) > 99) && (Zeny > 49999)) {
 			mes "[Marius]";
-			mes "Great! It is great!";
-			mes "I made one Binoculars!";
-			mes "And I found the right owner for it!";
+			mes "Perfect, perfect !";
+			mes "Now my masterpiece will be complete!";
+			mes "Muhahahaha !";
 			next;
-			delitem 2243,1;
-			delitem 999, 100;
+			delitem 2243,1;  //Spinning_Eyes
+			delitem 999,100;  //Steel
 			set Zeny,Zeny-50000;
-			next;
 			mes "[Marius]";
-			mes "Here you are... Binoculars!";
-			getitem 2296,1;
+			mes "Here you are!";
+			mes "Binoculars !";
+			getitem 2296,1; // Binoculars
 			next;
 			mes "[Marius]";
-			mes "I hope you won't need to use this Binoculars...";
-			mes "To see something tHat you shouldn't...";
-			mes "Ha! Ha! Ha!";
+			mes "Just remember...";
+			mes "Don't peep at something you shouldn't look at. Well, at least try not to.";
 			close;
 		}
+		else {
 			mes "[Marius]";
-			mes "Not enough! Insufficient items!";
-			mes "How can you disrespect the world's best alchemist? ";
-			mes "You have serious attitude problems!";
-			mes "This is ridiculous!";
+			mes "Argggghhhhhhh!!";
+			mes "You didn't bring";
+			mes "enough items!!!!";
+			mes "How dare you";
+			mes "disgrace me!!!";
+			mes "Baaaadddd !!";
 			close;
+		}
 	case 3:
 		mes "[Marius]";
-		mes "Hey! You!";
-		mes "You are talking to...";
-		mes "the world famous...";
-		mes "Optics master... Marius!";
-		mes "This is not the right attitude!";
+		mes "Hey you~!";
+		mes "Now you're in front of Marius, an Alchemist among Alchemists. Ignoring me, eh? Come on, I'll beat your ass!";
 		close;
 	}
 }
diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt
index 311c25c22..2d670516c 100644
--- a/npc/quests/quests_payon.txt
+++ b/npc/quests/quests_payon.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 1.6
+//= 1.7
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -17,6 +17,7 @@
 //= 1.5 Updated Dialogs from "Pretend Murdered Quest" [Samuray22]
 //= 1.5a replaced item "names" with item id. [Lupus]
 //= 1.6 Updated Dialogs from "Oxygen Mask Quest" [Samuray22]
+//= 1.7 Updated headgear quests. [L0ne_W0lf]
 //============================================================ 
 
 
@@ -24,245 +25,299 @@
 //==========================================================================================//
 //				Pretend Murdered quest
 //==========================================================================================//
-payon,154,170,4	script	Granny	78,{
-	if(countitem(1049) > 3 ) {
-		mes "[Granny in Payon]";
-		mes "Hey... Is this the item for Skirt of Virgin tHat my children will wear for the coming festival...";
-		mes "Could you give me some ^3355FF' Skirt of Virgin '^000000 for young girl... I need four of it... please ?";
-		mes "I am begging you, please!";
+payon_in01,99,72,4	script	Granny	103,{
+	if (checkweight(908,1) == 0) {
+		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
+		close;
+	}
+	if (countitem(1049) > 3) {
+		mes "[Granny]";
+		mes "I wish I could make some clothing for my grandchildren for the festival season...";
 		next;
-		switch(select( "Give it to her.","No way!")) {
+		mes "[Granny]";
+		mes "Oh! Would you give me your ^3355FFSkirt of Virgin^000000? I'd need four of them. Please, I'm begging you.";
+		next;
+		switch(select("Alright.:No way!")) {
 		case 1:
-			delitem 1049,4;
-			mes "[Granny in Payon]";
-			mes "Uh-uh... Thank you very much! Now I can make Skirt of Virgin for my children.";
-			mes "Hey... Oh! Yeah! I was in a stage play when I was young...";
-			mes "This is the overcoat I kept when I left the troupe after I got married...";
+			delitem 1049,4;  //Skirt_Of_Virgin
+			mes "[Granny]";
+			mes "Oh! Thank you so much~ Now I can make some clothes for Kitty Cutty~";
+			next;
+			mes "[Granny]";
+			mes "Ah, Wait! I almost forgot. I was quite a popular actress back in my youth. My actor friends gave me a wedding present when I left the Troupe. I've kept it to remind me of those precious times.";
 			next;
-			mes "[Granny in Payon]";
-			mes "Take it if you like it... please!";
-			mes "Good bye! Nice meeting you...";
-			getitem 2293,1;
+			mes "[Granny]";
+			mes "If it's okay...";
+			mes "I'd like to give you this.";
+			next;
+			getitem 2293,1; // Pretend_Murdered
+			mes "[Granny]";
+			mes "Goodbye, adventurer~!";
+			mes "Thank you for making an old woman so happy...";
 			close;
 		case 2:
-			mes "[Granny in Payon]";
-			mes "Uh-uh... How can I get  ^3355FF'Skirt of Virgin '^000000 by myself... I am so weak and tired.";
-			mes "It's such a cold world...";
+			mes "[Granny]";
+			mes "*Sigh* How can I get ^3355FFSkirt of Virgin^000000 by myself? I'm just so weak and feeble, even rolling in my rocking chair exhausts me. *Sniff* All I want is to make my grandchildren happy...";
 			close;
 		}
 	}
-		mes "[Granny in Payon]";
-		mes "I gather Mushrooms on the Mountain of Payon Everyday for my living. I don't know how I will survive this month.";
-		mes "... But festive is coming next month!";
-		mes "My children requested for Skirt of Virgin for this festival.";
-		mes "For Skirt of Virgin, I need ^3355FF' Skirt of Virgin '^000000 ...";
+	else {
+		mes "[Granny]";
+		mes "I gather Mushrooms on the Mountain of Payon everyday. Time passes and before I know it, it's already fesitval season. I wish I could make clothing for my family this time of the year.";
+		next;
+		mes "[Granny]";
+		mes "...";
+		mes "But for that, I need ^3355FF4 Skirt of Virgin^000000...";
 		next;
-		mes "[Granny in Payon]";
-		mes "Young man, I have a favor to ask... If you ever find ^3355FF' Skirt of Virgin '^000000... ";
-		mes "Please come back to me. I will never forget your kindness...";
+		mes "[Granny]";
+		mes "Young traveler, please help me. When you find some ^3355FFSkirt of Virgin^000000, please bring them to me. I'd really appreciate it...";
 		close;
+	}
 }
 
-
 //========================================================================================//
 //					Ear Muffs Quest
 //========================================================================================//
-payon_in01,18,10,4	script	Mystic Lady	75,{
+payon_in01,18,10,4	script	Mystic Lady	76,{
 	mes "[Mystic Lady]";
-	mes "Hi there.";
+	mes "My family has produced and sold the special Winter product ^3355FFEar Muffs^000000 for many years. We just moved here, but the weather is always warm so we can hardly make a living.";
 	next;
-	menu "Hello.",-,"Please make me a pair of Ear Muffs.",M_Muffs, "End",M_End;
-
-		mes "[Mystic Lady]";
-		mes "My family and I recently came to Payon.";
-		mes "Where we came from the weather was very cold so we started a business hand making a special type of ^5555FF'Ear Muffs'^000000";
-		next;
-		mes "[Mystic Lady]";
-		mes "I have tried to continue the family business here in Payon but it has proven to be difficult because of the warm whether.";
-		next;
-		mes "[Mystic Lady]";
-		mes "Although the 'Ear Muffs' aren't very useful here, if you plan on going somewhere that's cold our 'Ear Muffs' are a must have.";
-		next;
-		mes "[Mystic Lady]";
-		mes "All I need are:";
-		mes "^5555FF1 Cursed Ruby,";
-		mes "1 Headset,";
-		mes "200 Feathers,";
-		mes "and a 5,000 zeny fee^000000 for my labor.";
-		next;
-		mes "[Mystic Lady]";
-		mes "With those items I can make you a pair of 'Ear Muffs'.  Believe me, they are of the highest quality and look good on just about anybody!";
-		close;
-	
-	M_Muffs:
-		if(countitem(724)<1 || countitem(5001)<1 || countitem(949)<200 || zeny<5000) goto sL_NotEnuf;
-		delitem 724,1;
-		delitem 5001,1;
-		delitem 949,200;
-		set Zeny, Zeny-5000;
-		mes "[Mystic Lady]";
-		mes "Oh, I see that you have brought all of the required items.  Just a moment please...";
-		next;
-		mes "[Mystic Lady]";
-		mes "... this goes here... that goes there...... some glue here... a couple stitches over there..........";
-		next;
-		getitem 2283,1;
-		mes "[Mystic Lady]";
-		mes "Ah, there you are! One pair of my familys' specialty Ear Muffs.  Enjoy!";
-		close;
-
-		sL_NotEnuf:
+	mes "[Mystic Lady]";
+	mes "If you plan to travel to colder regions, I suggest that you bring some ^3355FFEar Muffs^000000...";
+	Emotion e_dots;
+	next;
+	mes "[Mystic Lady]";
+	mes "Ear Muffs are my family's specialty, and we provide it to customers who have ^FF33551 Cursed Ruby^000000, ^3311AA1 Headset,^000000 ^3355FF 200 Feathers^000000 and ^DDDD005000 Zeny^000000.";
+	Emotion e_dots;
+	next;
+	switch(select("Oh Yeah? That sounds good.:No thank you, Ma'am.")) {
+	case 1:
+		if ((countitem(724) > 0) && (countitem(916) > 199) && (countitem(5001) > 0) && (Zeny > 4999)) {
 			mes "[Mystic Lady]";
-			mes "I'm sorry but you don't have the required items for me to make you a pair of my familys' specialty Ear Muffs.";
+			delitem 724,1;  //Cardinal_Jewel_
+			delitem 916,200;  //Feather
+			delitem 5001,1;  //Headset
+			set Zeny,Zeny-5000;
+			mes "Here, I will give you this pre-made one.";
+			getitem 2283,1; // Ear_Mufs
+			next;
+			mes "[Mystic Lady]";
+			mes "Thank you for buying our product. You won't regret purchasing our Ear Muffs: Satisfaction guaranteed~";
+			Emotion e_dots;
+			close;
+		}
+		else {
+			mes "[Mystic Lady]";
+			mes "Oh dear...";
+			mes "You don't have enough money or items. Unfortunately, we can't give any discounts. Please understand that we have to make a living...";
+			Emotion e_dots;
 			close;
-	M_End:
+		}
+	case 2:
+		mes "[Mystic Lady]";
+		mes "That's fine.";
+		mes "I believe we";
+		mes "will meet again.";
+		mes "...One of these days.";
+		Emotion e_dots;
 		close;
-
+	}
 }
 
-
 //========================================================================================//
 //					Oxygen Mask Quest
 //========================================================================================//
-payon_in02,25,71,3	script	Young man#11	86,{
-	if(countitem(701) > 4) {
-		mes "[Young man]";
-		mes "What! Oh! No! No way!";
-		mes "Huh... You think that guy is cut... No! No way!!";
+payon_in02,25,71,4	script	Boy	86,{
+	if (countitem(701) > 4) {
+		mes "[Young Man]";
+		mes "ArrrGggghh!";
+		mes "Ah, No I can't...";
 		next;
-		switch(select( "Show him Ora Ora.","Give him Ora Ora.","Cancel.")) {
+		mes "[Young Man]";
+		mes "*Huk*";
+		mes "Now even my eyes have gone mad!! Why do these bugs suddenly seem so cute?! Nooooooo~!!!";
+		next;
+		switch(select("Show Ora Ora:Give Ora Ora:Cancel")) {
 		case 1:
-			mes "[Young man]";
-			mes "Wow! Wow! Wow!";
-			mes "This is Ora Ora...";
-			mes "I will speak frankly! If you are giving me this I will give you my treasure!";
-			mes "How about it? Don't you want it?";
+			mes "[Young Man]";
+			mes "Oooooohhhh!!!";
+			mes "Is, is this";
+			mes "the one?!";
+			mes "This is...";
+			mes "Ora Ora!!";
+			next;
+			mes "[Young Man]";
+			mes "I'll make it short! Give it to me, and I will give you my treasure! So how's my idea? Wanna deal?";
 			close;
 		case 2:
-			delitem 701, 5;
-			mes "[Young man]";
-			mes "Ha! Ha! Ha! I finally got it! Ora_Ora!";
-			mes "Damn Thief Bug!! Now I can kill you all!";
+			if (countitem(701) > 4) {
+				delitem 701,5;  //Ora_Ora
+			}
+			mes "[Young Man]";
+			mes "Muhahahahah!!!";
+			mes "I finally have this!";
+			mes "Ora Ora!";
+			mes "Stupid and Disgusting";
+			mes "Thief Bugs!!";
+			mes "You will pay!!!";
 			next;
-			mes "[Young man]";
-			mes "Ha! Ha! ... Ha! Ha!";
-			mes "I am sorry! I am too excited... Mm... I will give you my treasure as I promised!";
+			mes "[Young Man]";
+			mes "Huk...Huk...";
+			mes "Sorry, I was out of control with pleasure for a while. Now, I will give my treasure as promised.";
 			next;
-			getitem 5004, 1;
-			mes "[Young man]";
-			mes "If you breathe through this mouth piece... you can have fresh air all the time!";
-			mes "I used to worked by the sea and I brought one back with me.";
-			mes "I will give it to you for your kindness since I don't need it any more.";
+			getitem 5004,1; // Oxygen_Mask
+			mes "[Young Man]";
+			mes "When you wear this over your mouth and start to breathe, it filters junk out before getting to your lungs.";
 			next;
-			mes "[Young man]";
-			mes "Hey! Hey! THat's it! I want to try Ora Ora now!";
+			mes "[Young Man]";
+			mes "Kakakakakaka!";
+			mes "I can't wait";
+			mes "to use this";
+			mes "Ora Ora!";
 			close;
 		case 3:
-			mes "[Young man]";
-			mes "Uh... If it doesn't work on Thief bug...";
-			mes "Then I will have no choice but try to like Thief Bug... Hey...";
+			mes "[Young Man]";
+			mes "Huhuhuhuhu...";
+			mes "What if I can't get rid of all these Thief Bugs? I might even grow to love them... *Huk*";
 			close;
 		}
 	}
-		mes "[Young man]";
-		mes "Uh...Ah! I can't take it any more!";
-		mes "Damn Thief Bug!!";
+	else {
+		mes "[Young Man]";
+		mes "Wahhhhhh! I, I...";
+		mes "I can't take it any more!";
+		mes "You little stinky filthy bastards!";
 		next;
-		if( select( "Continue talking.","Cancel.") == 1) {
-			mes "[Young man]";
-			mes "My life was really rough.";
-			mes "My parents died when I was little... I had to work really hard to earn my living.";
+		switch(select("Continue:Cancel")) {
+		case 1:
+			mes "[Young Man]";
+			mes "Oh man...";
+			mes "It all started when my parents passed away when I was a little kid. Early on I had to work for a living, and had a really hard time.";
 			next;
-			mes "[Young man]";
-			mes "It's been ten years now... I got some saving... I dream to have my own house.";
+			mes "[Young Man]";
+			mes "I've worked for 10 years in hopes of buying my dream house where I could find some sense of peace and comfort again. Eventually I thought I had enough zeny to afford my very own sweet home.";
 			next;
-			mes "[Young man]";
-			mes "I can't afford a nice house even I spend all my saving on it...";
-			mes "However... I have a big but cheap house now... There weren't many choices for me...";
+			mes "[Young Man]";
+			mes "Unfortunately I didn't have enough money to buy the nice house that I had my eye on. But then, I found this house, which was bigger and cheaper than the first. I bought it without thinking...";
 			next;
-			mes "[Young man]";
-			mes "And now it is taken over by the damn Thief Bug as their den.";
+			mes "[Young Man]";
+			mes "Sweet Jesus! Turns out, it's a Heaven for Thief Bugs!!!";
 			next;
-			mes "[Young man]";
-			mes "I tried anything I could... To hunt them... To drive them away... Nothing really worked. They always come back!";
-			mes "I even burned my own house.";
+			mes "[Young Man]";
+			mes "I tried to do everything I could do. I coaxed them, killed them, but it only brought peace for a moment! I even tried to burn this house down...!";
 			next;
-			mes "[Young man]";
-			mes "Ah... I really want them to disappear... Do you think^3355FF Ora Ora^000000 is the answer?";
-			mes "I heard it is possible to find it in other countries...";
-			mes "If only I got five of it... I can get rid of them forever...";
+			mes "[Young Man]";
+			mes "*Gasp* I mean, really, do I need ^3355FF Ora Ora^000000 to get rid of them? People say it is very rarely seen in distant countries.";
+			next;
+			mes "[Young Man]";
+			mes "If I could afford 5 of them, I won't have to be frustrated with these disgusting bugs any more...";
 			close;
-		}
-			mes "[Young man]";
-			mes "I just can't make them disappear no matter how... I am so tired of it... I can't take it any more... WHatever...";
+		case 2:
+			mes "[Young Man]";
+			mes "This never ending fight with the bugs has really exhausted me. I give up. Do as you wish you scumbags!";
 			close;
+		}
+	}
 }
 
-
 //========================================================================================//
 //			Derivuchi Cap(Hat of Petite Diablo), Helm of Angel
 //========================================================================================//
-payon_in01,56,12,4	script	Young Man#12	89,{
-	mes "[Young Man]";
-	mes "What is it?............";
+payon_in01,56,12,7	script	Young man#12	89,{
+	mes "[Young man]";
+	mes "...What is it?";
 	next;
-	menu "Can you make me a special item?",-, "Nothing.",M_End;
-
-		mes "[Young Man]";
-		mes "I see.... so you know about me huh?.... Ok, tell me what you want.";
+	switch(select("Can you make me a special item?:Hey.")) {
+	case 1:
+		mes "[Young man]";
+		mes "Huh? So you already know what I specialize in, eh? I suppose there's no need for the usual secrecy. Tell me what you want.";
 		next;
-		menu "-Helm of Angel",-, "-Deviruchi Hat",sM_Devir, "-I'll come back later.",M_End;
-
-			mes "[Young Man]";
-			mes "For the Helm of Angel I will need:";
-			mes "- ^5555FF1 Helm (slotted)^000000.";
-			mes "- ^5555FF1 Angel Wing^000000.";
-			mes "- ^5555FF5 Fang of Garm^000000.";
-			set @HAT, 1;
+		switch(select("Helm of Angel.:Deviruchi cap.:I will come next time.")) {
+		case 1:
+			mes "[Young man]";
+			mes "1 Helm (with slot).";
+			mes "1 Angel Wing.";
+			mes "5 Fang of Hatii.";
+			mes "That's all I require.";
 			next;
-			goto sL_GetHat;
-		sM_Devir:
-			mes "[Young Man]";
-			mes "For the Deviruchi Hat I will need:";
-			mes "- ^5555FF600 Little Evil Horn^000000.";
-			mes "- ^5555FF40 Talon of Griffon^000000.";
-			set @HAT, 2;
-
-			sL_GetHat:
-				mes "[Young Man]";
-				mes "Wait a moment!  Be careful about what items you give me.";
-				mes "I do not distinguish between equipment that has been forged or has cards attached to them.";
-				mes "If you don't want to loose a precious card or piece of equipment, make sure you don't have it equiped.";
-				next;
-				mes "[Young Man]";
-				mes "Do you have all of the items needed?";
-				menu "-Give him the items.",-, "Nevermind.",M_End;
-
-				if(@HAT == 2) goto ssL_Devir;
-
-					if(countitem(2229)<1 || countitem(2254)<1 || countitem(7036)<5) goto ssL_NotEnuf;
-					delitem 2229, 1;
-					delitem 2254, 1;
-					delitem 7036, 5;
-					mes "[Young Man]";
-					mes "Here is your Helm of Angel.";
-					getitem 5025, 1;
-					close;
-				ssL_Devir:
-					if(countitem(1038)<600 || countitem(7048)<40) goto ssL_NotEnuf;
-					delitem 1038, 600;
-					delitem 7048, 40;
-					mes "[Young Man]";
-					mes "Here is your Deviruchi Hat.";
-					getitem 5038, 1;
+			mes "[Young man]";
+			mes "Wait! Just so you know, I don't care if the items in your inventory have been upgraded, or have cards attached.";
+			next;
+			mes "[Young man]";
+			mes "I mean, any cards or upgrades in the items I will use to make something for you will be lost once I make the item. So be careful when you hand stuff over to me.";
+			next;
+			mes "[Young man]";
+			mes "Did you gather the items? Then hand them over.";
+			next;
+			switch(select("Give him the items.:Don't give him the items.")) {
+			case 1:
+				if ((countitem(2229) > 0) && (countitem(2254) > 0) && (countitem(7036) > 4)) {
+					mes "[Young man]";
+					mes ".....Hm.";
+					mes "Fine, here's your Helm of Angel. Take it.";
+					delitem 2229,1;  //Helm_
+					delitem 2254,1;  //Angelic_Chain
+					delitem 7036,5;  //Fang_Of_Garm
+					close2;
+					getitem 5025,1; // Helm_Of_Angel
+					end;
+				}
+				else {
+					mes "[Young man]";
+					mes "...The number of items is not right. You better double check.";
 					close;
-				ssL_NotEnuf:
-					mes "[Young Man]";
-					mes "You don't have enough items for me to make what you want.";
+				}
+			case 2:
+				mes "[Young man]";
+				mes "Do as you wish...";
+				close;
+			}
+		case 2:
+			mes "[Young man]";
+			mes "600 Little Evil Horn.";
+			mes "40 Talon of Griffon.";
+			mes "That's all I require.";
+			next;
+			mes "[Young man]";
+			mes "Wait! Just so you know, I don't care if the items in your inventory have been upgraded, or have cards attached.";
+			next;
+			mes "[Young man]";
+			mes "I mean, any cards or upgrades in the items I will use to make something for you will be lost once I make the item. So be careful when you hand stuff over to me.";
+			next;
+			mes "[Young man]";
+			mes "Did you gather the items? Then hand them over.";
+			next;
+			switch(select("Give him the items.:Don't give him the items.")) {
+			case 1:
+				if ((countitem(1038) > 599) && (countitem(7048) > 39)) {
+					mes "[Young man]";
+					mes ".....Hm. Here's your Deviruchi Hat. Please take it.";
+					delitem 1038,600;  //Petite_DiablOfs_Horn
+					delitem 7048,40;  //Talon_Of_Griffin
+					close2;
+					getitem 5038,1; // Deviruchi_Cap
+					end;
+				}
+				else {
+					mes "[Young man]";
+					mes "...The number of items isn't right. You better double check.";
 					close;
-
-	M_End:
-		mes "[Young Man]";
-		mes "Fine then.....";
+				}
+			case 2:
+				mes "[Young man]";
+				mes "Do as you wish...";
+				close;
+			}
+		case 3:
+			mes "[Young man]";
+			mes "Hm. Alright.";
+			mes "Then we shall meet again.";
+			close;
+		}
+	case 2:
+		mes "[Young man]";
+		mes "Hm.";
+		mes "Take care.";
 		close;
+	}
 }
diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt
index fe547a587..1480bd1ab 100644
--- a/npc/quests/quests_prontera.txt
+++ b/npc/quests/quests_prontera.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 2.3b
+//= 2.4
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -16,6 +16,7 @@
 //= - [Aegis Conversion]
 //= - Variable in use: MISC_QUEST (bit 8)
 //= Ph.D Hat Quest:
+//= - [Aegis Conversion]
 //= - n/a
 //= Gaebolg Family Curse:
 //= - [Aegis Conversion]
@@ -41,6 +42,7 @@
 //= 2.3 Bamph will now talk to those who failed the Gaebolg quest. [L0ne_W0lf]
 //= 2.3a Touch up to Bamph fo other fail-points. [L0ne_W0lf]
 //= 2.3b Hopefully the last change needed for Nameless quest. [L0ne_W0lf]
+//= 2.4 Updated Headgear Quest. [L0ne_W0lf]
 //============================================================ 
 
 // Prontera Culvert
@@ -160,78 +162,86 @@ prt_fild05,270,212,5	script	Culvert Guardian	105,{
 
 // Ph.D Hat Quest
 //============================================================ 
-prt_in,38,108,3	script	Teacher	53,{
-	if(countitem(710) > 0 && countitem(703) > 0 && countitem(704) > 0 && countitem(708) > 0) {
+prt_in,38,108,4	script	Teacher	53,{
+	if ((countitem(710) > 0) && (countitem(703) > 0) && (countitem(606) > 0) && (countitem(708) > 0)) {
 		mes "[Teacher]";
-		mes "My God! The Flower you are holding...";
+		mes "Oh...";
+		mes "Those Flowers in your hand are...";
 		next;
-		switch( select( "Show her the flowers.","Give her the flowers.","Cancel.")) {
-			case 1:
+		switch(select("Show Flowers:Present Flowers:Cancel")) {
+		case 1:
+			mes "[Teacher]";
+			mes "Ah...";
+			mes "Those are definitely the 4 kinds of Flowers I was looking for! Would you give them to me?";
+			next;
+			mes "[Teacher]";
+			mes "If you would...";
+			mes "I'll give you my precious item.";
+			close;
+		case 2:
+			if ((countitem(710) > 0) && (countitem(703) > 0) && (countitem(606) > 0) && (countitem(708) > 0)) {
+				delitem 710,1;  //Illusion_Flower
+				delitem 703,1;  //Hinalle
+				delitem 606,1;  //Aloe
+				delitem 708,1;  //Ment
+				getitem 5012,1;	//Ph.D_Hat
 				mes "[Teacher]";
-				mes "Are those the Flowers I've been looking for...";
-				mes "Would you give them to me?";
+				mes "I really really appreciate you what you've done for me. I'm truly grateful. I will give my precious item to you as promised.";
 				next;
 				mes "[Teacher]";
-				mes "If you give them to me... I... I will give my precious item...";
+				mes "This is the Hat I've worn on my Graduation from my University. It reminds me of my happy school days. Please take this...";
 				close;
-			case 2:
-				if(countitem(710) > 0 && countitem(703) > 0 && countitem(704) > 0 && countitem(708) > 0) {
-					delitem 710,1;
-					delitem 703,1;
-					delitem 704,1;
-					delitem 708,1;
-					getitem 5012,1;
-					mes "[Teacher]";
-					mes "Thank you so much! First time in my life someone is nice to me!";
-					mes "I will give you my precious item like I promised you.";
-					mes "This is the cap I wore when I graduated, it is full of my school memory.";
-					mes "Please take it... I hope you would cherish it like me.";
-					close;
-				}
-					mes "[Teacher]";
-					mes "... After a closer look I realized those are not the flowers I want...";
-					mes "Ha! Ha! I have really bad eyesight...";
-					close;
-			case 3:
+			}
+			else {
+				mes "[Teacher]";
+				mes "... Oh, I'm Sorry.";
+				mes "But that's not what I'm looking for. Maybe you need to study flowers a little bit?";
 				close;
 			}
+		}
 	}
-	mes "[Teacher]";
-	mes "Those flowers are pretty... Right?";
-	next;
-	switch( select( "Continue talking.","Cancel.")) {
+	else {
+		mes "[Teacher]";
+		mes "Don't you think...";
+		mes "Flowers are pretty?";
+		next;
+		switch(select("Talk:Quit")) {
 		case 1:
 			mes "[Teacher]";
-			mes "I seldom go out with anyone when I was young, I was studying all the time.";
-			mes "Sometimes I think I've wasted my youth ... But I don't regret it. Because I study hard, I got good education and become who I am today!";
+			mes "When I was young,";
+			mes "I had no friends and";
+			mes "studied all the time.";
+			next;
+			mes "[Teacher]";
+			mes "Sometimes I regret what I did when I was younger, but it's not a big deal now. Through hard study, I finished entire educational courses earlier than all the other students.";
 			next;
 			mes "[Teacher]";
-			mes "But honestly... I feel sad sometimes for not having good friends...";
-			mes "When I get tired of studying... I don't even have a friend to talk to...";
-			mes "Luckily, I found the true friend of my life at last.";
+			mes "However...";
+			mes "I was sad and sometimes lonely. Whenever the studying got too hard, I needed someone who would listen to me. Finally, one day, I met my best friend.";
 			next;
 			mes "[Teacher]";
-			mes "When I walked into that garden and saw all the beautiful flowers...";
-			mes "I suddenly feel I am sharing the same fate as these flowers, so they become my best friends ever.";
+			mes "When I saw a Pretty Flower blooming in the abandoned Garden, I realized It was my friend which shared my fate.";
 			next;
 			mes "[Teacher]";
-			mes "For others, they are just flowers... But for me, they are my source of strength.";
-			mes "I can't have achieved anything without their company.";
+			mes "Although it is a Common and Normal Flower to others, she gave me the reason to study again. I could achieve my goals because of her.";
 			next;
 			mes "[Teacher]";
-			mes "That's why I start to think about doing something to repay the people who had given me the flowers.";
-			mes "We have done so much research about flowers here... We even want to build a place full of flowers... for a better world!";
+			mes "So recently...";
+			mes "I am trying to pay her back. Now I am studying Flowers, and plan to over the whole world with them.";
 			next;
 			mes "[Teacher]";
-			mes "So... We really need a large amount of flowers...";
-			mes "But I never go out anywhere... It is hard for me to find any!";
-			mes "If you can find me  ^3355FFIllusion Flower^000000, ^3355FFHinalle^000000, ^3355FFAloe^000000 and ^3355FFMent^000000 and bring them to me, I will give you my treasure.";
+			mes "To accomplish my work...";
+			mes "I need bunches of flowers. But for someone who rarely goes outside, it is really hard to find all the flowers I need.";
+			next;
+			mes "[Teacher]";
+			mes "I need 1 ^3355FFIllusion Flower^000000 ,1 ^3355FFHinalle^000000,1 ^3355FFAloe^000000 and 1 ^3355FFMent^000000. If you can bring them to me, I'd give you my treasure...";
 			close;
 		case 2:
 			mes "[Teacher]";
-			mes "One day I will use a lot of flowers to make the most pretty place in the world...";
+			mes "One of these days I will cover this whole world with Flowers.";
 			close;
 		}
+	}
 }
 
 // Gaebolg Family Curse