- Updates to several npc files to match AEGIS standards.

- Added Cash Hair Stylist (disabled by default).

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

8 files changed, 1117 insertions, 766 deletions

diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt
index 0bd1cfdcc..828569b46 100644
--- a/npc/merchants/ammo_boxes.txt
+++ b/npc/merchants/ammo_boxes.txt
@@ -3,125 +3,133 @@
 //===== By: ==================================================
 //= eAthena dev team
 //===== Current Version: =====================================
-//= 1.2a
+//= 1.3
 //===== Compatible With: =====================================
-//= eAthena 1.0+
+//= eAthena SVN
 //===== Description: =========================================
-//= Turns bullets/spheres into packs/casings.
+//= Turns bullets into magazines/packs.
 //===== Additional Comments: =================================
 //= 1.0 First version. [SinSloth]
 //= 1.1 Optimized version - Reduced to only one function [SinSloth]
 //= 1.2 Optimized^2, corrected npc's name [ultramage]
 //= 1.2a Optimized. Please, ommit extra NPC names [Lupus]
+//= 1.3 Updated to match AEGIS script. [Kisuka]
 //============================================================
 
 que_ng,187,149,3	script	Magazine Dealer Kenny	83,{
-
-	mes "[Kenny]";	
-	mes "I am the Casing Dealer, Kenny!";
-	if(BaseJob != Job_Gunslinger) {
-		mes "I'm here to package the Shells";
-		mes "and Bullets for Gunslingers.";
-		next;
+	if(BaseJob == Job_Gunslinger) {
 		mes "[Kenny]";
-		mes "But you don't look like a";
-		mes "Gunslinger to me. I'm afraid";
-		mes "that I must ask you to leave";
-		mes "after you're done looking around.";
-		close;
+		mes "Welcome to my Magazine Shop.";
+		mes "As you may know, large numbers";
+		mes "of bullets can be carried more";
+		mes "easily when they're in Magazines. Now, can I interest you in";
+		mes "anything in particular?";
+		next;
+		switch(select("Wind Sphere Pack:Shadow Sphere Pack:Poison Sphere Pack:Water Sphere Pack:Fire Sphere Pack:Cartridge:Blood Cartridge:Silver Cartridge:Cancel")) {
+		case 1: callfunc "Func_Casing",13204,12144; break;
+		case 2: callfunc "Func_Casing",13206,12145; break;
+		case 3: callfunc "Func_Casing",13205,12146; break;
+		case 4: callfunc "Func_Casing",13207,12147; break;
+		case 5: callfunc "Func_Casing",13203,12148; break;
+		case 6: callfunc "Func_Casing",13200,12149; break;
+		case 7: callfunc "Func_Casing",13202,12150; break;
+		case 8: callfunc "Func_Casing",13201,12151; break;
+		case 9:
+			mes "[Kenny]";
+			mes "Well, if you ever find";
+			mes "that you have too many";
+			mes "bullets, come and see me.";
+			mes "It's a smart idea to store";
+			mes "bullets with my Magazines.";
+			close;
+		}
 	}
-	mes "If your bullets are getting";
-	mes "too heavy, come to me!";
-	next;
 	mes "[Kenny]";
-	mes "I can make you Casings and Packs,";
-	mes "which will let you carry the";
-	mes "Spheres at a lower weight!";
-	mes "Come on! Take a look!";
+	mes "Welcome to my shop.";
+	mes "Here, I provide Magazines";
+	mes "and Cartridges for Gunslingers.";
+	mes "Sorry, but it doesn't look like";
+	mes "my services would be of any";
+	mes "use to you, adventurer.";
 	next;
-	switch(select("Lightning Sphere Pack","Blind Sphere Pack","Poison Sphere Pack","Freezing Sphere Pack","Flare Sphere Pack","Bullet Casing","Shell of Blood Casing","Silver Bullet Casing","Cancel")) {
-	case 1: callfunc "Func_Casing",13204,12144; break;
-	case 2: callfunc "Func_Casing",13206,12145; break;
-	case 3: callfunc "Func_Casing",13205,12146; break;
-	case 4: callfunc "Func_Casing",13207,12147; break;
-	case 5: callfunc "Func_Casing",13203,12148; break;
-	case 6: callfunc "Func_Casing",13200,12149; break;
-	case 7: callfunc "Func_Casing",13202,12150; break;
-	case 8: callfunc "Func_Casing",13201,12151; break;
-	default:
-		mes "[Kenny]";
-		mes "Alright. If there's";
-		mes "something else I can help";
-		mes "you with, please tell me.";
-		close;
-	}
+	mes "[Kenny]";
+	mes "Eh, but if you happen to";
+	mes "know any Gunslingers, send";
+	mes "them my way. You can never";
+	mes "have too many bullets.";
 	close;
 }
 
 function	script	Func_Casing	{
-
 	mes "[Kenny]";
-	mes "Please input the amount you want.";
+	mes "Now, you can trade";
+	mes "500 "+getitemname(getarg(1))+"s";
+	mes "and 500 zeny for 1 "+getitemname(getarg(0))+", so make sure";
+	mes "you have sufficient bullets";
+	mes "and zeny for this exchange.";
 	next;
 	mes "[Kenny]";
-	mes "" +getitemname(getarg(1))+ " will";
-	if(getarg(0) == 13202) 
-		mes "cost 500 Shells of Blood";
-	else
-		mes "cost 500 " +getitemname(getarg(0))+ "s";
-	mes "and 500 zeny each.";
+	mes "You can exchange 500 "+getitemname(getarg(1))+"s and 500 zeny";
+	mes "with 1 "+getitemname(getarg(0))+".";
 	next;
 	mes "[Kenny]";
-	mes "You can trade a maximum of 50.";
-	mes "Input 0 if you want to cancel.";
+	mes "Remember that I can't give";
+	mes "you more than 50 Magazines";
+	mes "at a time. Now please enter";
+	mes "the number of Magazines you";
+	mes "want to receive. If you want to cancel, then just enter ''0.''";
 	next;
 	input .@amount;
-	mes "[Kenny]";
-	if(.@amount < 1) {
-		mes "Alright. If there's";
-		mes "something else I can help";
-		mes "you with, please tell me.";
-		close;
-	}
-	if(.@amount > 50)	{
-		mes "You've exceeded the limit!";
-		mes "Try again next time?";
-		close;
-	}
-	//Weight checking
-	if(checkweight(getarg(1), .@amount) != 1)	{
-		mes "You are overweight.";
-		mes "Please clear your inventory.";
-		close;
-	}
-	
-	//Materials checking
-	if(countitem(getarg(0)) < .@amount * 500) {
-		mes "Huh......";
-		mes "You don't have enough";
-		mes "materials to trade for";
-		mes "the number of items you";
-		mes "want. Please come with the";
-		mes "correct amount of items.";
+	if(.@amount > 50 || .@amount == 0) {
+		mes "[Kenny]";
+		mes "Hey, I can't give you";
+		mes "that many Magazines.";
+		mes "Please try again, and";
+		mes "enter a number no";
+		mes "greater than 50.";
 		close;
 	}
-	
-	//Zeny checking
-	if(Zeny < .@amount * 500) {
-		mes "Erm... You don't have enough money.";
-		mes "The fee is 500 zeny";
-		mes "Check your zeny and come again.";
+	if (countitem(getarg(1)) >= (500*.@amount)) {
+		if (Zeny >= (500*.@amount)) {
+			if (checkweight(getarg(1),.@amount) == 0) {
+				mes "[Kenny]";
+				mes "Hey, you've got a lot";
+				mes "of junk crammed in your";
+				mes "Inventory. Free up some";
+				mes "space, and then come back";
+				mes "and trade your bullets for";
+				mes "some Magazines later, okay?";
+				close;
+			}else{
+				mes "[Kenny]";
+				mes "Alright, here are";
+				mes "your Magazines. Thanks";
+				mes "for visiting my shop, and";
+				mes "I hope that you use all";
+				mes "of your ammo wisely.";
+				set Zeny,Zeny-500*.@amount;
+				delitem getarg(0),500*.@amount;
+				getitem getarg(1),.@amount;
+				close;
+			}
+		}else{
+			mes "[Kenny]";
+			mes "Sorry, but you don't";
+			mes "have enough zeny for";
+			mes "this Magazine exchange.";
+			mes "Come back to my shop";
+			mes "after you've saved up";
+			mes "some more money.";
+			close;
+		}
+	}else{
+		mes "[Kenny]";
+		mes "Sorry, but you don't";
+		mes "have enough bullets for";
+		mes "this Magazine exchange.";
+		mes "Maybe you should double";
+		mes "check your Inventory, and";
+		mes "then come back to me later.";
 		close;
 	}
-
-	mes "Ah very well!";
-	mes "The number is confirmed!";
-	if(getarg(1) < 12149)
-		mes "I'll get you the Packs right away.";
-	else
-		mes "I'll get you the Casings right away.";
-	set Zeny, Zeny - .@amount * 500;
-	delitem getarg(0), .@amount * 500;
-	getitem getarg(1), .@amount;
-	close;
-}
+}
\ No newline at end of file
diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt
index 6742b6022..3163b3d43 100644
--- a/npc/merchants/ammo_dealer.txt
+++ b/npc/merchants/ammo_dealer.txt
@@ -3,9 +3,9 @@
 //===== By ===================================================
 //= Playtester, Paradox924X
 //===== Version ==============================================
-//= 1.3
+//= 1.4
 //===== Compatible With ======================================
-//= eAthena SVN with jAthena scripting engine and . variables
+//= eAthena SVN
 //===== Description ==========================================
 //= Bullet trader.
 //===== Comments =============================================
@@ -14,21 +14,17 @@
 //= 1.2 More optimized conversion [Legionaire]
 //= 1.2a Removed .GATs [Lupus]
 //= 1.3 Fixed [Playtester] Optimized. Got rid of @vars [Lupus]
+//= 1.4 Updated to match AEGIS script. [Kisuka]
 //============================================================
 
 que_ng,187,156,3	script	Bullet Dealer Tony	86,{
-
-	mes "[Tony]";
 	if (BaseJob == Job_Gunslinger) {
-		mes "I'm Bullet-tooth Tony!";
-		mes "Whenever your out of bullets,";
-		mes "Visit me!!!";
-		next;
 		mes "[Tony]";
-		mes "Now~! Friend~Companion~ Buddy~";
-		mes "What do you need?!";
-		mes "Choose anything~!";
-		mes "And pay money~!";
+		mes "I'm Tony, the Bullet Dealer.";
+		mes "Come to me whenever you're";
+		mes "short on ammo. Just bring me";
+		mes "the materials, and I'll make";
+		mes "you the bullets you need.";
 		next;
 		switch(select("Poison Sphere:Flare Sphere:Lighting Sphere:Blind Sphere:Freezing Sphere:Cancel")) {
 		case 1: callfunc "Bullet_Trade",937,10,13205; break;
@@ -36,66 +32,92 @@ que_ng,187,156,3	script	Bullet Dealer Tony	86,{
 		case 3: callfunc "Bullet_Trade",7053,3,13204; break;
 		case 4: callfunc "Bullet_Trade",1024,5,13206; break;
 		case 5: callfunc "Bullet_Trade",7054,2,13207; break;
-		default:
+		case 6:
 			mes "[Tony]";
-			mes "Mmm~ Okay~";
-			mes "Please visit again~";
-			mes "I, Bullet-tooth Tony,";
-			mes "Will always be here~!!!";
+			mes "Changed your mind?";
+			mes "Well, if you ever need";
+			mes "any bullets, I'll be right";
+			mes "here. Come back whenever";
+			mes "you think you'll need more";
+			mes "ammunition, Gunslinger.";
 			close;
 		}
 	}
-	mes "I'm a trader who supplies";
-	mes "Gunslingers with trade items.";
-	mes "I am called Bullet-tooth Tony.";
+	mes "[Tony]";
+	mes "Hey, I'm Tony. I'm in";
+	mes "charge of distributing";
+	mes "and making bullets for";
+	mes "Gunslingers. It's just";
+	mes "how our guild likes";
+	mes "to do things.";
 	next;
 	mes "[Tony]";
-	mes "I don't think you are a Gunslinger";
-	mes "So just look around";
-	mes "and go.";
+	mes "I'm sorry if you came";
+	mes "here to buy some bullets.";
+	mes "I can only do business with";
+	mes "fully fledged Gunslingers.";
 	close;
 }
 
 function	script	Bullet_Trade	{
 	mes "[Tony]";
-	mes "Input the amount you wish to purchase.";
-	next;
-	mes "[Tony]";
-	mes "We trade 30 "+getitemname(getarg(2))+"s for";
-	mes "1 Phracon,";
+	mes "For every set of";
+	mes "30 "+getitemname(getarg(2))+"s,";
+	mes "you must give me";
 	mes "1 Emveretarcon,";
-	mes "and "+getarg(1)+" "+getitemname(getarg(0))+".";
+	mes "1 Phracon, and";
+	mes ""+getarg(1)+" "+getitemname(getarg(0))+".";
 	next;
 	mes "[Tony]";
-	mes "The maximum number you can trade is 500.";
-	mes "If you want to cancel, input 0.";
+	mes "Remember that I can give";
+	mes "a maximum of 500 sets of";
+	mes "30 bullets at a time. Please";
+	mes "enter the number of bullet sets";
+	mes "that you'd like. If you want to";
+	mes "cancel, then just enter ''0.''";
 	next;
 	input .@amount;
-	mes "[Tony]";
 	if (.@amount < 1 || .@amount > 500) {
-		mes "Invalid Amount!";
-		mes "Enter again~!";
+		mes "[Tony]";
+		mes "Hey, I can't give you";
+		mes "that many bullets. Don't";
+		mes "forget to enter a number";
+		mes "that's no higher than 500";
+		mes "if you want to trade your";
+		mes "items for some bullets.";
 		close;
-	} else if (countitem(1010) >= .@amount && countitem(1011) >= .@amount && countitem(getarg(0)) >= (.@amount*getarg(1))) {
+	}
+	if (countitem(1010) >= .@amount && countitem(1011) >= .@amount && countitem(getarg(0)) >= (.@amount*getarg(1))) {
 		if (checkweight(getarg(2),.@amount * 30) == 0) {
-			mes "I cannot give it to you because your inventory is full. Come back after your inventory has more space.";
+			mes "[Tony]";
+			mes "Eh? Your Inventory doesn't";
+			mes "have enough space for this";
+			mes "many bullets. Come back later";
+			mes "after you make more space";
+			mes "available. Try putting some of";
+			mes "your things into Kafra Storage.";
 			close;
-		} else {
-			mes "Oh~ Good!";
-			mes "Trade number checked!";
-			mes "I'll trade immediately.";
+		}else{
+			mes "[Tony]";
+			mes "Great, everything seems";
+			mes "to be in order. Let me take";
+			mes "these materials, and here are";
+			mes "your bullets. It's a pleasure";
+			mes "to do business with you~";
 			delitem 1010,.@amount;
 			delitem 1011,.@amount;
 			delitem getarg(0),.@amount * getarg(1);
 			getitem getarg(2),.@amount * 30;
 			close;
 		}
-	} else {
-		mes "Tsk Tsk~";
-		mes "You do not have";
-		mes "enough items for the";
-		mes "items you want to trade.";
-		mes "Prepare again and come back.";
+	}else{
+		mes "[Tony]";
+		mes "Huh. It looks like you";
+		mes "don't have enough materials";
+		mes "for that many bullets. Well,";
+		mes "it's no problem. Just come";
+		mes "back after gathering everything";
+		mes "that you need, okay?";
 		close;
 	}
 }
diff --git a/npc/merchants/cash_hair.txt b/npc/merchants/cash_hair.txt
new file mode 100644
index 000000000..aea26e5ec
--- /dev/null
+++ b/npc/merchants/cash_hair.txt
@@ -0,0 +1,125 @@
+//===== eAthena Script ======================================= 

+//= Cash Hair Stylist

+//===== By: ================================================== 

+//= Kisuka

+//===== Current Version: ===================================== 

+//= 1.0

+//===== Compatible With: ===================================== 

+//= eAthena SVN

+//===== Description: ========================================= 

+//= Exchange cash item, New_Style_Coupon, for new hair styles.

+//===== Additional Comments: ================================= 

+//= 1.0 First Version. [Kisuka]

+//============================================================

+

+itemmall,19,74,5	script	Stylist#cash	91,{

+	mes "[Stylist]";

+	mes "Hey, I'm Kaniki.";

+	mes "I'm here to start a new";

+	mes "trend by introducing my";

+	mes "special new hairstyles!";

+	mes "Give me a ^FF0000New Style Coupon^000000,";

+	mes "and I'll change your hair~";

+	next;

+	if (Sex == 1) {

+		mes "[Kaniki]";

+		mes "I have two special";

+		mes "hairstyles for men, the";

+		mes "Emergency Heal Perm";

+		mes "and the Aura Blade Cut.";

+		mes "and aura blade cut.";

+		next;

+		cutin "hair_m_24.bmp",4;

+		mes "[Kaniki]";

+		mes "This is the Emergency";

+		mes "Heal Perm. It's a brand";

+		mes "new style I invented recently.";

+		mes "What do you think? Cool, huh?";

+		next;

+		cutin "",255;

+		cutin "hair_m_25.bmp",4;

+		mes "[Kaniki]";

+		mes "Now this is the Aura";

+		mes "Blade Cut. You haven't";

+		mes "seen anything like it";

+		mes "before, haven't you?";

+		next;

+		cutin "",255;

+	}else{

+		mes "[Kaniki]";

+		mes "I have two new hairstyles for";

+		mes "women, the Assumptio Perm";

+		mes "and the Soul Changer Cut.";

+		mes "Do you want to see how";

+		mes "these styles look?";

+		next;

+		cutin "hair_f_24.bmp",4;

+		mes "[Kaniki]";

+		mes "This is the Assumptio";

+		mes "Perm. It'd really good";

+		mes "on you, wouldn't it?";

+		next;

+		cutin "",255;

+		cutin "hair_f_25.bmp",4;

+		mes "[Kaniki]";

+		mes "Next is the Soul";

+		mes "Changer Cut. What do";

+		mes "you think? Isn't it nice?";

+		next;

+		cutin "",255;

+	}

+	mes "[Kaniki]";

+	mes "Have you decided";

+	mes "if you'd like me to";

+	mes "change your hairstyle?";

+	next;

+	if(select("Change Hairstyle:Don't Change") == 1) {

+		if (countitem(7622) > 0) {

+			mes "[Kaniki]";

+			mes "Great, you brought";

+			mes "a New Style Coupon!";

+			mes "Alright, which hairstyle";

+			mes "did you want to have?";

+			next;

+			if (Sex == 1) {

+				if(select("Emergency Heal Perm:Aura Blade Cut") == 1) {

+					delitem 7622,1;	// New_Style_Coupon

+					setlook 1,24;

+				}else{

+					delitem 7622,1;	// New_Style_Coupon

+					setlook 1,25;

+				}

+			}else{

+				if(select("Assumptio Perm:Soul Changer Cut") == 1) {

+					delitem 7622,1;	// New_Style_Coupon

+					setlook 1,24;

+				}else{

+					delitem 7622,1;	// New_Style_Coupon

+					setlook 1,25;

+				}

+			}

+			mes "[Kaniki]";

+			mes "There--! It's done!";

+			mes "How do you like your";

+			mes "new hair? Well, I hope";

+			mes "to see you again. Take care!";

+			close;

+		}else{

+			mes "[Kaniki]";

+			mes "I'm sorry, but I can";

+			mes "only provide my hairstyling";

+			mes "service if you bring a New";

+			mes "Style Coupon. Please come";

+			mes "back to me after you manage to";

+			mes "get one of those coupons, okay?";

+			close;

+		}

+	}

+	mes "[Kaniki]";

+	mes "Really? Oh, that's too bad.";

+	mes "Well, if you ever change your";

+	mes "mind about updating your";

+	mes "hairstyle, come back";

+	mes "and let me know, okay?";

+	close;

+}
\ No newline at end of file
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index 334f423c5..94ffc2a8b 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -1,9 +1,9 @@
 //===== eAthena Script =======================================
 //= Hair Dresser
 //===== By: ==================================================
-//= [Muad_Dib] 1.0 (The Prometheus Project) & Samuray22
+//= Muad_Dib, Samuray22, Kisuka
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -11,393 +11,500 @@
 //= Allows you to change your hairstyle.
 //===== Additional Comments: =================================
 //= 1.2 Rescripted to the Aegis 10.3 Standards. [Samuray22]
+//= 1.3 Updated to match AEGIS script. [Kisuka]
 //============================================================
 
-// Stylist - alberta_in 55 142
-alberta_in,55,142,1	script	Stylist	91,{
+// Hair Dresser Veronica
+// ============================================================
+alberta_in,55,142,7	script	Hair Dresser	91,{
 	mes "[Veronica]";
-	mes "Welcome~~ Welcome~~";
-	mes "Welcome to the one of the best Hair shop, Veronika Beauty Saloon!! HoHoHo";
-	mes "Come here for new hair, right? ^^ How may I help you?";
+	mes "Welcome to Veronica's hair salon.";
+	mes "How can I help you?";
 	next;
-	switch(select("Look through Hair Styles.","Change Hair Styles.","Stop talking.")) {
-		case 1:
+	switch(select("See available hair styles.:Change hair style.:End conversation.")) {
+	case 1:
+		mes "[Veronica]";
+		mes "We have a total of 19 styles, available from no.1 to no.19.";
+		mes "Which one do you want to see?";
+		mes "If you wish to cancel,";
+		mes "please enter 0.";
+		next;
+		input .@style;
+		if(.@style > 19) {
 			mes "[Veronica]";
-			mes "There are 19 Hair Styles, 1 ~ 19!!!";
-			mes "Which number do you want to look at first?";
-			mes "If you want to stop looking, please choose 0.";
+			mes "Oops, I'm sorry, but that";
+			mes "style is not available.";
+			mes "Remember to enter a number";
+			mes "from 1 to 19.";
 			next;
-			input .@style;
-			if(.@style > 19) {
-				mes "[Veronica]";
-				mes "Sorry, there aren't any hair styles with that number.";
-				mes "Please choose number from 1 to 19.";
-				next;
-			} else if(.@style == 0) {
-				mes "[Veronica]";
-				mes "How was it?";
-				mes "Did you find any styles you like?";
-				mes "If you want to chage your hair style at anytime, I will do my best!!";
-				close;
+		} else if(.@style == 0) {
+			mes "[Veronica]";
+			mes "So, how do you like the style?";
+			mes "Feel free to ask me about any";
+			mes "available hairstyle. It will";
+			mes "be my pleasure to style your";
+			mes "hair.";
+			close;
+		}
+		else {
+			callsub L_cutin,.@style;
+			mes "[Veronica]";
+			switch(.@style) {
+			case 1:
+				if(Sex == 1) {
+					mes "Oh, that's 'Play Dead' style!";
+					mes "It's a nice, basic haircut.";
+					mes "I notice that usually the";
+					mes "cute, conversative types seem";
+					mes "to prefer this style.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'First Aid' style!";
+					mes "The shoulder length tresses";
+					mes "are straightened for those";
+					mes "no nonsense adventurers. It";
+					mes "seems to be the style of";
+					mes "choice for Novices.";
+					close2; cutin "",255; end;
+			case 2:
+				if(Sex == 1) {
+					mes "Oh, that's the 'Two Handed Sword";
+					mes "Mastery' style! It's perfect for";
+					mes "for Swordmen who might muss their";
+					mes "hair while swinging their swords";
+					mes "all day long.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Bash' style!";
+					mes "For the powerful woman that's";
+					mes "not afraid to get a little";
+					mes "blood on her hands, but knows";
+					mes "how great her hair will look";
+					mes "while wildly flailing a sword.";
+					close2; cutin "",255; end;
+			case 3:
+				if(Sex == 1) {
+					mes "Oh, that's 'Napalm Beat' style!";
+					mes "It's a unique look with a hint";
+					mes "of eccentricity that's offset";
+					mes "with a helping of elegance.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Frost Diver' style!";
+					mes "The pigtails lend an innocent,";
+					mes "demure look for those Mages";
+					mes "and Wizards that usually scare";
+					mes "off the boys with their spells.";
+					close2; cutin "",255; end;
+			case 4:
+				if(Sex == 1) {
+					mes "Oh, that's the 'Double Strafe'";
+					mes "style! The arrangement of the";
+					mes "hair conducts ambient static";
+					mes "electricity, naturally clearing";
+					mes "the mind. At least, that's what";
+					mes "I was taught in fashion school.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Arrow Shower' style!";
+					mes "For the Bowswoman who doesn't";
+					mes "want fashion to interfere with";
+					mes "her depth perception. Much more";
+					mes "attractive than those horrid";
+					mes "granny-style hairbuns.";
+					close2; cutin "",255; end;
+			case 5:
+				if(Sex == 1) {
+					mes "Oh, that's 'Angelus' style!";
+					mes "It's for calm and devout people,";
+					mes "as well as those bashful,";
+					mes "mild-mannered types.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Heal' style!";
+					mes "This is in trend among";
+					mes "Priests and Acolytes since";
+					mes "this style is appropriate";
+					mes "for formal situations, but";
+					mes "is also practical in battle.";
+					close2; cutin "",255; end;
+			case 6:
+				if(Sex == 1) {
+					mes "Oh, that's 'Push Cart' style!";
+					mes "It was based on the design of a";
+					mes "cart...at least, that's what";
+					mes "I learned in beautician school.";
+					close2; cutin "",255; end;
+				}
+					mes "Ooh, that's 'Vending' style!";
+					mes "It's the hairdo of money";
+					mes "makers...and if I may say so,";
+					mes "it's also economical.";
+					close2; cutin "",255; end;
+			case 7:
+				if(Sex == 1) {
+					mes "Ooh, that's 'Envenom' style!";
+					mes "It looks great on Thieves and";
+					mes "and Assassins when they're";
+					mes "out poisoning people and animals.";
+					mes "It's fashion for the aggressive";
+					mes "and eclectic~!";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Double Attack' style!";
+					mes "The adorable pigtail, paired with";
+					mes "those provacative bangs are sure";
+					mes "to help you steal the heart of";
+					mes "some cute guy.";
+					close2; cutin "",255; end;
+			case 8:
+				if(Sex == 1) {
+					mes "Oh, that's 'Bowling Bash' style!";
+					mes "A popular style for Knights, its";
+					mes "manly, rugged look tends to";
+					mes "attract all of the ladies,";
+					mes "and looks great on men with";
+					mes "strong chins.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Gloria' style!";
+					mes "It's very elegant and looks";
+					mes "great on holy Priests. This";
+					mes "style is most attractive to";
+					mes "ladies who aren't that used";
+					mes "to fighting with their hands.";
+					close2; cutin "",255; end;
+			case 9:
+				if(Sex == 1) {
+					mes "Oh, that's 'Venom Dust' style!";
+					mes "Definitely a look for rebels,";
+					mes "the sweeping, yet decidedly";
+					mes "luxorious locks seems to enchant";
+					mes "girls with a fatal attraction.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'SP Recovery' style!";
+					mes "To add more body to the special";
+					mes "style of these bangs, I use a";
+					mes "special conditioner that makes";
+					mes "you feel like you're regaining SP";
+					mes "...Although, it acutally doesn't.";
+					close2; cutin "",255; end;
+			case 10:
+				if(Sex == 1) {
+					mes "Oh, that's 'Turn Undead' style!";
+					mes "This is popular among Priests";
+					mes "that want a serious, yet a bit";
+					mes "of a wild, agressive look.";
+					mes "Definitely more attractive";
+					mes "than the 'Holy Light' mullet.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Prepare Potion' style!";
+					mes "The flared out tresses are chosen";
+					mes "by beginning Alchemists, since";
+					mes "early, explosive experiments would";
+					mes "make their hair to stick out anyway.";
+					close2; cutin "",255; end;
+			case 11:
+				if(Sex == 1) {
+					mes "Oh, that's 'Dragonology' style!";
+					mes "It's neat and clean cut, perfect";
+					mes "for studious people and looks";
+					mes "great with eyeglasses. This";
+					mes "is a fashion well suited to";
+					mes "intellectual types.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Grand Cross' style!";
+					mes "It's in style among those pious";
+					mes "Crusaders that need hair that";
+					mes "won't muss during fighting, yet";
+					mes "is respectable enough to attend";
+					mes "religious services.";
+					close2; cutin "",255; end;
+			case 12:
+				if(Sex == 1) {
+					mes "Oh, that's 'Mace Mastery' style!";
+					mes "A lot of care goes into making";
+					mes "that tussled hair say, 'I don't";
+					mes "care how I look at all.'";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Intimidate' style!"";
+					mes "The Rogue women seem to like";
+					mes "this style...although I imagine";
+					mes "that more of them would prefer";
+					mes "something wilder to match those";
+					mes "stockings...";
+					close2; cutin "",255; end;
+			case 13:
+				if(Sex == 1) {
+					mes "Oh, that's 'Thunder Storm' style!";
+					mes "This hot, flamboyant hairstyle";
+					mes "flares out wildly like thunder.";
+					mes "...And you will too with this new look.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Spiritual Sphere";
+					mes "Absorption' style! There's a";
+					mes "charismatic quality to this";
+					mes "fashion: it's tough, slightly";
+					mes "tomboyish, but not so much";
+					mes "that it can't be cute.";
+					close2; cutin "",255; end;
+			case 14:
+				if(Sex == 1) {
+					mes "Oh, that's 'Encore' style!";
+					mes "The elegant, flowing locks";
+					mes "fit well with Bards, or men who";
+					mes "appreciate the value of male";
+					mes "beauty.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Gypsy's Kiss' style!";
+					mes "Dancers seem to like this style,";
+					mes "although personally, I think";
+					mes "this fashion fits very well";
+					mes "with glasses.";
+					close2; cutin "",255; end;
+			case 15:
+				if(Sex == 1) {
+					mes "Oh, that's 'Grimtooth' style!";
+					mes "Spiky and unkempt, this style";
+					mes "is a popular counterculture";
+					mes "street fashion. You might";
+					mes "not want to wear your hair";
+					mes "this way at a wedding, though.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Counter Attack' style!";
+					mes "This is an intimidating look for";
+					mes "girls that want to say 'You hit";
+					mes "me, I'll hit you back!' It really";
+					mes "emphasizes strong looking";
+					mes "foreheads and cheekbones.";
+					close2; cutin "",255; end;
+			case 16:
+				if(Sex == 1) {
+					mes "Oh, that's 'Blitz Beat' style!";
+					mes "A funky and lively fashion,";
+					mes "this style was developed for a";
+					mes "Hunter who liked really long";
+					mes "bangs and wanted to see";
+					mes "through them at the same time.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Anke Snare' style!";
+					mes "The style style is specially";
+					mes "made for Hunters that don't like";
+					mes "to get their hair tangled...";
+					mes "After all, what kind of Hunter";
+					mes "lets their hair get trapped?";
+					close2; cutin "",255; end;
+			case 17:
+				if(Sex == 1) {
+					mes "Oh, that's 'Find Ore' style!";
+					mes "It's a practical, economical look";
+					mes "that is popular among Blacksmiths.";
+					mes "Some swear that this fashion helps";
+					mes "them in finding ores, but where's";
+					mes "the science in that??";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Hammer Fall' style!";
+					mes "For the woman that doesn't want";
+					mes "her hair to get in the way when";
+					mes "she's savagely swinging heavy";
+					mes "objects. Of course, this is a";
+					mes "Blacksmith favorite.";
+					close2; cutin "",255; end;
+			case 18:
+				if(Sex == 1) {
+					mes "Oh, that's 'Fire Pillar' style!";
+					mes "It's a trendy look, in which";
+					mes "you cover one eye for that";
+					mes "intrigue effect. The element";
+					mes "of mystery is always in";
+					mes "fashion, don't you think?";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Jupitel Thunder'";
+					mes "style! A look that strikes";
+					mes "like lightening, without";
+					mes "any of that annoying static";
+					mes "cling or muss. This fashion";
+					mes "looks great with Mage Hats.";
+					close2; cutin "",255; end;
+			case 19:
+				if(Sex == 1) {
+					mes "Oh, that's 'Guillotine Fist'";
+					mes "style! The smooth, slicked back";
+					mes "pompadour shows that you're";
+					mes "serious about your passion";
+					mes "for brawling... or just your passion.";
+					close2; cutin "",255; end;
+				}
+					mes "Oh, that's 'Whirlwind' style!";
+					mes "A favorite among the studious";
+					mes "Sages, the hair is tied back";
+					mes "in a stylish braid so that";
+					mes "it doesn't fly around after";
+					mes "casting those windy spells.";
+					close2; cutin "",255; end;
 			}
-				callsub L_cutin,.@style;
-				mes "[Veronica]";
-				switch(.@style) {
+	case 2:
+		if(BaseLevel < 60) {
+			mes "[Veronica]";
+			mes "Oh, dear, you're looking fabulous with";
+			mes "your current hairstyle. Why don't you";
+			mes "try a new hair accessory rather than changing your look?";
+			close;
+		} else if((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) || (Zeny < 99800)) {
+			mes "[Veronica]";
+			mes "If you wish to change your";
+			mes "hairstyle, you should meet some";
+			mes "requirements. I suggest that you";
+			mes "write down all the items that";
+			mes "you will need.";
+			next;
+			mes "[Veronica]";
+			mes "3 Counteragent,";
+			mes "3 Mixture,";
+			mes "100 Danggie,";
+			mes "100 Short Danggie,";
+			mes "100 Black Hair,";
+			mes "100 Golden Hair,";
+			mes "100 Glossy Hair, and lastly...";
+			next;
+			mes "[Veronica]";
+			mes "You will need 99,800 zeny.";
+			mes "Please come back when you're";
+			mes "ready. I will make you look";
+			mes "fabulous. Hohohohoho~";
+			close;
+		}
+		mes "[Veronica]";
+		mes "Okay now, please choose the style";
+		mes "you desire from styles no.1 to";
+		mes "no.19.  I will do my best to";
+		mes "make you look your very best.";
+		next;
+		input .@style;
+		if(.@style > 19) {
+			mes "[Veronica]";
+			mes "I am sorry, you chose an unavailable style.";
+			mes "Make sure you enter the correct number.";
+			close;
+		} else if(.@style == 0) {
+			mes "[Veronica]";
+			mes "You have canceled your request.";
+			close;
+		} else if(getlook(1) == .@style) {
+			mes "[Veronica]";
+			mes "I am sorry, but you are already";
+			mes "wearing the style you have";
+			mes "requested. Would you please";
+			mes "choose a different style?";
+			close;
+		}
+			callsub L_cutin,.@style;
+			mes "[Veronica]";
+			mes "You have chosen style no. (" + input + ").";
+			mes "I shall proceed with your request.";
+			mes "Would you mind?";
+			next;
+			if(select("No, I don't mind.:Yes, let me choose another one.") == 1) {
+				if(getlook(6) == 0) {
+					mes "[Veronica]";
+					mes "Oh, my, you haven't dyed your hair";
+					mes "at all. You would look even more";
+					mes "fabulous if you dyed your hair...";
+					mes "Oh well, I will do it for free.";
+					mes "So what kind of color would you like?";
+					next;
+					switch(select("Red.:Yellow.:Purple.:Orange.:Green.:Blue.:White.:Dark Brown.:Cancel.")) {
 					case 1:
-						if(Sex == 1) {
-							mes "Oh~ 'Trickdead' style'!";
-							mes "It is very neat feature and comfortable.";
-							mes "How do you think? Do you like it?";
-							close2;
-							cutin "",255;
-							end;
-						}
-							mes "Oh~ 'First Aid' style'!";
-							mes "It is the style people wants to stroke your hair^^.";
-							mes "How do you think? Do you like it?";
-							close2;
-							cutin "",255;
-							end;
+						set .@pallete,8;
+						break;
 					case 2:
-						if(Sex == 1) {
-							mes "Oh~ 'Two-Handed Sword Mastery' style!";
-							mes "Its style is very similar to one of the famous Swordman.";
-							mes "How do you think? Do you like it?";
-							close2;
-							cutin "",255;
-							end;
-						}
-							mes "Oh~ 'Bash' style!";
-							mes "It feels unrevealed strong power is hidden inside of....";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
+						set .@pallete,1;
+						break;
 					case 3:
-						if(Sex == 1) {
-							mes "Oh~ 'Napalm Beat' style!";
-							mes "It makes feeling there is unknown power...";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Frost Diver' style!";
-							mes "It feels cold but also warm...";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
+						set .@pallete,2;
+						break;
 					case 4:
-						if(Sex == 1) {
-							mes "Oh~ 'Double Strafe' style!";
-							mes "It will make you feel your mind is very clear.";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Arrow Shower' style!";
-							mes "It feels very refreshed~";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
+						set .@pallete,3;
+						break;
 					case 5:
-						if(Sex == 1) {
-							mes "Oh~ 'Angelus' style!";
-							mes "It feels calm and reverence.";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Heal' style!";
-							mes "It feels mind is cured.";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
+						set .@pallete,4;
+						break;
 					case 6:
-						if(Sex == 1) {
-							mes "Oh~ 'Pushcart' style!";
-							mes "This is the style based on motive of string cart..";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Vending' style!";
-							mes "It seems like making lots of money.";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
+						set .@pallete,5;
+						break;
 					case 7:
-						if(Sex == 1) {
-							mes "Oh~ 'Envenom' style!";
-							mes "It makes feel addicting into something..";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Double Strafe' style!";
-							mes "It makes whomever dash twice.";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
+						set .@pallete,6;
+						break;
 					case 8:
-						if(Sex == 1) {
-							mes "Oh~ 'Bowling Bash' style!";
-							mes "Once people sees it, they will fall for it!";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Gloria' style!";
-							mes "Its nobleness and holiness moods are great.";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
+						set .@pallete,7;
+						break;
 					case 9:
-						if(Sex == 1) {
-							mes "Oh~ 'Venom Dust' style!";
-							mes "It is the style gives feeling deadly charm.";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Increase SP Recovery' style!";
-							mes "It makes feel like recovering spirit fully.";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-					case 10:
-						if(Sex == 1) {
-							mes "Oh~ 'Turn Undead' style!";
-							mes "It gives feeling one attack can make Devils disappear!";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Prepare Potion' style!";
-							mes "It feels a wound is healed already!";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-					case 11:
-						if(Sex == 1) {
-							mes "Oh~ 'Dragonology' style!";
-							mes "This is the style based on motive of mysterious Dragon...";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Grand Cross' style!";
-							mes "It feels a firm faith...";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-					case 12:
-						if(Sex == 1) {
-							mes "Oh~ 'Mace Mastery' style!";
-							mes "It looks very hard and attractive!";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Intimidate' style!";
-							mes "It seems you saw this style somewhere...?";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-					case 13:
-						if(Sex == 1) {
-							mes "Oh~ 'Thunderstorm' style!";
-							mes "It feels hit by thunder storm!!";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Spiritual Sphere Absorption' style!";
-							mes "It catches people's spirits^^";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-					case 14:
-						if(Sex == 1) {
-							mes "Oh~ 'Encore' style!";
-							mes "It is the style makes people feels like asking you to sing~^^";
-							mes "How do you think? Do you like it??";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Gypsy's Kiss' style!";
-							mes "It makes people think you are very kind to all...";
-							mes "How do you think? Do you like it?";
-							close2; cutin "",255; end;
-					case 15:
-						if(Sex == 1) {
-							mes "Oh~ 'Grimtooth' style!";
-							mes "It feels like you will be pricked by hair!";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Counter Attack' style!";
-							mes "It feels it will kick when someone is near!";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
-					case 16:
-						if(Sex == 1) {
-							mes "Oh~ 'Blitz Beat' style!";
-							mes "It feels it will attack 5 times...?";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Ankle Snare' style!";
-							mes "This is the style hardly move.";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
-					case 17:
-						if(Sex == 1) {
-							mes "Oh~ 'Ore Discovery' style!";
-							mes "It feels like picking up things while walking.";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Hammer Fall' style!";
-							mes "It will make feeling dizzy!";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
-					case 18:
-						if(Sex == 1) {
-							mes "Oh~ 'Fire Pillar' style!";
-							mes "It has been a great style over the one generation...!";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Jupitel Thunder' style!";
-							mes "It feels very neat.";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
-					case 19:
-						if(Sex == 1) {
-							mes "Oh~ 'Guillotine Fist' style!";
-							mes "It feels like betting all at once!!";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
-						}
-							mes "Oh~ 'Whirlwind' style!";
-							mes "It feels very refresh like wind.";
-							mes "How was it? Do you like it?";
-							close2; cutin "",255; end;
+						mes "[Veronica]";
+						mes "Oh, I was gonna do it for free.";
+						mes "Well, if you change your mind, please come again.";
+						mes "The color of your hair enhances your look.";
+						close;
+					}
 				}
-		case 2:
-			if(BaseLevel < 60) {
+				nude;
 				mes "[Veronica]";
-				mes "Wow~, Dear, this style looks good on you~";
-				mes "Don't change strangely.";
-				mes "Why don't you decorate hair with accessories~";
-				close;
-			} else if((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) || (Zeny < 99800)) {
-				mes "[Veronica]";
-				mes "If you want to change your hair style, you need several items";
-				mes "Since you need many items....";
-				mes "I think you should write those down.";
+				mes "Now, let's get started. Try to";
+				mes "stay still, dear. If you move,";
+				mes "it might ruin the perfect look";
+				mes "I intend to give you. Trust me,";
+				mes "I will make you look fabulous~";
 				next;
 				mes "[Veronica]";
-				mes "3 Counteragent,";
-				mes "3 Mixture,";
-				mes "100 Daenggies,";
-				mes "100 Short Daenggies,";
-				mes "100 Black Hairs,";
-				mes "100 Golden Hairs,";
-				mes "100 Glossy Hair.";
+				mes "- *snip snip snip snip* -";
+				mes "- *bzzzzzzz bzzzzzzz bzzzzzzz bzzzzzzz* -";
+				mes "- *snip snip snip snip* -";
+				mes "- *bzzzzzzz bzzzzzzz bzzzzzzz bzzzzzzz* -";
 				next;
+				set Zeny,Zeny-99800;
+				delitem 973,3;	// Counteragent
+				delitem 974,3;	// Mixture
+				delitem 901,100;	// Danggie
+				delitem 1094,100;	// Short_Daenggie
+				delitem 1020,100;	// Long_Hair
+				delitem 1060,100;	// Golden_Hair
+				delitem 7152,100;	// Glossy_Hair
+				setlook 1,.@style;
+				setlook 6,.@pallete;
+				cutin "",255;
 				mes "[Veronica]";
-				mes "And also you need 99,800 zeny.";
-				mes "If you gather them all...";
-				mes "I will show you what I can do~!! ^^ HoHoHo.";
-				close;
-			}
-			mes "[Veronica]";
-			mes "Well, then... Please choose Hair Style you like the most.";
-			mes "I will do my best ^^";
-			mes "There are 19 different Hair Styles.";
-			mes "Numbers from 1 to 19~";
-			next;
-			input .@style;
-			if(.@style > 19) {
-				mes "[Veronica]";
-				mes "There are no such numbers like that!";
-				mes "Please check your number~";
-				close;
-			} else if(.@style == 0) {
-				mes "[Veronica]";
-				mes "It's been canceled.";
-				close;
-			} else if(getlook(1) == .@style) {
-				mes "[Veronica]";
-				mes "You already have this style!!";
-				mes "I think you should look through Hair Styles again";
+				mes "Alright, it's done~";
+				mes "I hope you like";
+				mes "this style no.(" + input + ").";
+				mes "Feel free to come back anytime";
+				mes "when you want a new hairstyle. Hohohohohoho~";
+				setlook 1,.@style;
+				setlook 6,.@pallete;
 				close;
 			}
-				callsub L_cutin,.@style;
-				mes "[Veronica]";
-				mes "This is (" + .@style + ") style.";
-				mes "I will change your hair with this again.";
-				mes "Is that OK with you??";
-				next;
-				if(select("Yeah~ I'd love to.","No..I don't like it...") == 1) {
-						if(getlook(6) == 0) {
-							mes "[Veronica]";
-							mes "You haven't dyeing your hair~ Not even once!!";
-							mes "I think dyeing your hair makes you much better...";
-							mes "I can do it for you as a service... for FREE ^^";
-							mes "Which color do you want?";
-							next;
-							switch(select("Red","Yellow","Purple","Orange","Green","Blue","White","Black","Cancel")) {
-								case 1:
-									set .@pallete,8;
-									goto L_style;
-								case 2:
-									set .@pallete,1;
-									goto L_style;
-								case 3:
-									set .@pallete,2;
-									goto L_style;
-								case 4:
-									set .@pallete,3;
-									goto L_style;
-								case 5:
-									set .@pallete,4;
-									goto L_style;
-								case 6:
-									set .@pallete,5;
-									goto L_style;
-								case 7:
-									set .@pallete,6;
-									goto L_style;
-								case 8:
-									set .@pallete,7;
-									goto L_style;
-								case 9:
-									mes "[Veronica]";
-									mes "Well.. then think it over..";
-									mes "and come visit me again.";
-									mes "Not only type of hair style but also color of it is very important.";
-									close;
-							}
-						}
-				L_style:
-						mes "[Veronica]";
-						mes "Now, It begins~. Hold still~";
-						mes "If you move, you will have very bad style^^";
-						mes "Just trust me on this!!";
-						next;
-						mes "[Veronica]";
-						mes "- Clip clip Clip clip -";
-						mes "- Klit klit Klit klit -";
-						mes "- Snip snip Snip snip -";
-						next;
-						delitem 973,3;
-						delitem 974,3;
-						delitem 901,100;
-						delitem 1094,100;
-						delitem 1020,100;
-						delitem 1060,100;
-						delitem 7152,100;
-						setlook 1,.@style;
-						setlook 6,.@pallete;
-						cutin "",255;
-						mes "[Veronica]";
-						mes "Wow~ it came out very well~~~ ";
-						mes "I hope you like this (" + .@style + ") style. ^^";
-						mes "If you'd like to have other hair style,";
-						mes "you are welcome to visit me anytime~ HoHoHo";
-						setlook 1,.@style;
-						setlook 6,.@pallete;
-						close;
-				}
-						mes "[Veronica]";
-						mes "Well~ choose again please~";
-						mes "There shold be a style you like.";
-						mes "Just remember the number you like the most abd tell me.";
-						close;
-		case 3:
 			mes "[Veronica]";
-			mes "Everyone has rights to become beautiful...";
-			mes "I wish you can find your hair style which fits on you well~";
-			mes "I really do~ ^^";
+			mes "Okay then, please choose one";
+			mes "a hairstyle again. I believe";
+			mes "you will find the look that's best for you.";
 			close;
+	case 3:
+		mes "[Veronica]";
+		mes "Everybody deserves the right to";
+		mes "pursue beauty. I hope that you";
+		mes "will find the right hairstyle";
+		mes "one of these days.";
+		close;
 	}
+
 L_cutin:
 	if(Sex == 1) {
 		if(getarg(0) < 10)
@@ -413,99 +520,164 @@ L_cutin:
 	return;
 }
 
-// Gypsy Hairdresser - alberta 33 141
-alberta,33,141,1	script	Gypsy Hairdresser	87,{
-	mes "[Bisharm]";
-	mes "Omg! Kidding me she is a desinger!!";
-	mes "One of the best?? Yeah..whatever...";
-	mes "I'm the only one who knows what's the true dudism and value of hair!";
-	mes "I am a CREATOR of BEAUTY!";
+// Roving Hair Dresser
+// ============================================================
+alberta,33,141,7	script	Roving Hair Dresser	87,{
+	mes "[Rui Vishop]";
+	mes "That Veronica...";
+	mes "Hah! Best hair dresser my ass.";
+	mes "She's not the best hair dresser...";
+	mes "...";
+	mes "I am!";
+	next;
+	mes "[Rui Vishop]";
+	mes "I, Rui Vishop, the man to whom";
+	mes "all scalps are canvases";
+	mes "waiting to be transformed into";
+	mes "works of magnificent art~!";
 	next;
-	switch(select("What do you do?","Please bless me also!!",".....")) {
-		case 1:
-			mes "[Bisharm]";
-			mes "ME? I am a hairdresser.";
-			mes "I am drifting from place to place...and";
-			mes "giving people beauty of hair.";
-			mes "I heard there is....";
-			mes "there is a novice who is calling oneself a hair designer in this town...";
+	switch(select("What are you?:Do my hair, please!:.....")) {
+	case 1:
+		mes "[Rui Vishop]";
+		mes "Do you not know that I, Rui";
+		mes "Vishop, maestro of the shears";
+		mes "and sculptor of hair, am an";
+		mes "artist far ahead of his time?!";
+		mes "Well, I suppose an adventurer";
+		mes "like yourself wouldn't know...";
+		next;
+		mes "[Rui Vishop]";
+		mes "As a hair sculptor, I find joy";
+		mes "in bestowing upon others the";
+		mes "supreme favour of doing their";
+		mes "hairstyle at a reasonable price.";
+		next;
+		mes "[Rui Vishop]";
+		mes "Recently, however, I happened to";
+		mes "overhear that some tyro has had";
+		mes "the audacity to call herself a";
+		mes "hair dresser.";
+		next;
+		mes "[Rui Vishop]";
+		mes "So one day I went there,";
+		mes "pretending to be a customer.";
+		mes "I was apalled to see the boring,";
+		mes "lifeless hairstyles that she was";
+		mes "giving all of her clients...";
+		next;
+		mes "[Rui Vishop]";
+		mes "It wasn't hard to notice that her";
+		mes "skills, or lack thereof, are a";
+		mes "joke. She brings shame to the";
+		mes "great and honorable";
+		mes "profession of hair dressing.";
+		mes "A complete and utter disgrace!";
+		next;
+		mes "[Rui Vishop]";
+		mes "But the worst part was...";
+		mes "she forced her customers to";
+		mes "choose a hairstyle before she";
+		mes "styled their hair!";
+		next;
+		mes "[Rui Vishop]";
+		mes "That's not how talented hair";
+		mes "dressers do their job! She";
+		mes "should know what hair style will";
+		mes "fit a customer without ever";
+		mes "asking them!";
+		next;
+		mes "[Rui Vishop]";
+		mes "If by any chance you decide to";
+		mes "do your hair, don't even think";
+		mes "about giving her patronage.";
+		mes "Instead, you may ask for my";
+		mes "services. I assure you, I am";
+		mes "faaaar better than her.";
+		next;
+		mes "[Rui Vishop]";
+		mes "Do you understand? I mean, don't";
+		mes "let her ruin your hair needlessly!";
+		mes "You could get a Swordman to hack";
+		mes "away at your hair if you want a";
+		mes "hairstyle that horrible~!";
+		close;
+	case 2:
+		if(BaseLevel < 60) {
+			mes "[Rui Vishop]";
+			mes "Hmm, I must say, your current";
+			mes "style fits you best. Trust me, I know what I am saying.";
+			close;
+		} else if(Zeny < 199800) {
+			mes "[Rui Vishop]";
+			mes "Ah, I see that that you can";
+			mes "recognize genius when it is";
+			mes "right before you. In light";
+			mes "of your good taste, I will";
+			mes "only require money for my";
+			mes "services.";
 			next;
-			mes "[Bisharm]";
-			mes "That's why I came to this town.";
-			mes "I was watching and I find out everyone asks what they want from the menu...";
-			mes "That is not the way!!";
-			mes "There are some cases..";
-			mes "hairs don't look good on people when listening to them!";
+			mes "[Rui Vishop]";
+			mes "Simply pay me the small";
+			mes "fee of 199,800 zeny. You must";
+			mes "know that I am doing you a";
+			mes "huge favor by charging you";
+			mes "such a small amount. My";
+			mes "art is priceless, after all.";
+			close;
+		}
+		mes "[Rui Vishop]";
+		mes "Alright, I will be taking my";
+		mes "199,800 zeny service charge now.";
+		next;
+		mes "[Rui Vishop]";
+		mes "If you don't wish to do";
+		mes "this right now, though I can't";
+		mes "imagine why, you may ask that";
+		mes "stupid hair dresser to";
+		mes "do her clumsy work on you...";
+		next;
+		if(select("No, please do my hair.:Umm, I changed my mind.") ==1 ) {
+			mes "[Rui Vishop]";
+			mes "O~k~a~y!";
+			mes "Now, let us begin~!";
 			next;
-			mes "[Bisharm]";
-			mes "Also very amateur skill...";
-			mes "Very very...amateur...";
-			mes "You can't call it a beauty designer!";
-			mes "Waisting too mush hairs!";
-			mes "In short I don't like it very well!!";
+			mes "[Rui Vishop]";
+			mes "Wooooo~oooohhhh!! Toohhhhh~oooohhhh!!";
 			next;
-			mes "[Bisharm]";
-			mes "If you want me to touch your hair,";
-			mes "please ask me anytime.";
-			mes "I'll specially do my best for you.";
-			mes "Got it?";
-			mes "Don't ever let novice touch your hair!";
-			close;
-		case 2:
-			if(BaseLevel < 60) {
-				mes "[Bisharm]";
-				mes "Hmm, From my artistic perspective,";
-				mes "the hair style you have looks very good on you!";
-				mes "You should stay with it!";
-				mes "Trust me!";
-				close;
-			} else if(Zeny < 199800) {
-				mes "[Bisharm]";
-				mes "Yeah? You don't need anything else. You only need ZENY!";
-				mes "You just need 199,800 zeny.";
-				mes "Just let you know.... ";
-				mes "that you should feel an honor about me touching your hair with only this price...";
-				close;
-			}
-				mes "[Bisharm]";
-				mes "Good, I will take 199,800 zeny for my fee.";
-				mes "OK?";
-				mes "You still have chance to go to that novice and do your hair....";
-				mes "It's up to you...";
-				next;
-				if(select("I will ask you a favor","Well..I will pass..") ==1 ) {
-					mes "[Bisharm]";
-					mes "Alright!----- Here goes!!!";
-					mes "Watch yourself!!";
-					next;
-					mes "[Bisharm]";
-					mes "Wooohhhhhhhhh!!!!";
-					next;
-					mes "[Bisharm]";
-					mes "Yipe!! Yeah!! Yeah~~~~~!!";
-					next;
-					mes "[Bisharm]";
-					mes "Finished...!! great...GREAT!!";
-					mes "The style no one can't creat!!!!";
-					mes "Phu..Hahahahahaha!!";
-					setlook 1,rand(1,19);
-					setlook 6,rand(1,6);
-					set Zeny,Zeny-199800;
-					close;
-				}
-					mes "[Bisharm]";
-					mes "Hmm! Whatever...!! You'll regret this!!";
-					mes "You'll relize only great artisan can...";
-					mes "can creat real beauty.....";
-					mes "You will relize it...someday...";
-					close;
-		case 3:
-			mes "[Bisharm]";
-			mes "I feel so sorry for people";
-			mes "who let their hairs to be touched by a NOVICE";
-			mes "who doesn't know anything about beauty!!";
-			mes "I feel really really sorry for them!!";
+			mes "[Rui Vishop]";
+			mes "Woooooo~aaaaaaahhhhh!!";
+			next;
+			mes "[Rui Vishop]";
+			mes "Voila!";
+			next;
+			mes "[Rui Vishop]";
+			mes "Oh, great~ it's awesome!";
+			mes "Another Vishop masterpiece~";
+			mes "Once more I've outdone myself.";
+			mes "It's such a unique and talented";
+			mes "style! Yes, I am the best! Wooohahahahahaha!";
+			set Zeny,Zeny-199800;
+			setlook 1,rand(1,19);
+			setlook 6,rand(1,8);
 			close;
+		}
+		mes "[Rui Vishop]";
+		mes "Bah! Alright! It's your decision.";
+		mes "But don't blame me later!";
+		mes "One day you'll wake up, realize";
+		mes "you're ugly and regret not";
+		mes "having my genius shape every lock";
+		mes "of hair on your head.";
+		close;
+	case 3:
+		mes "[Rui Vishop]";
+		mes "What? What a shame!";
+		mes "Will you let that...that";
+		mes "charlatan of a hair dresser ruin";
+		mes "your hairstyle!? I'm sure the";
+		mes "heavens are crying tears of";
+		mes "pity at mankind's ignorance...";
+		close;
 	}
 }
 
diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt
index eec7b0171..eb1dd0c63 100644
--- a/npc/merchants/icecream.txt
+++ b/npc/merchants/icecream.txt
@@ -1,61 +1,82 @@
 //===== eAthena Script =======================================
 //= Ice Cream Maker
 //===== By: ==================================================
-//= KOOK SWU
+//= KOOK SWU, Kisuka
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
-//= eAthena 1.0
+//= eAthena SVN
 //===== Description: =========================================
 //= A man makes you ice-cream
 //===== Additional Comments: =================================
 //= 1.1 Optimized, changed overlapping coords in Alberta [Lupus]
 //= 1.2 According to the patch, IceCream seller has been removed from Morocc [Lupus]
+//= 1.3 No more label menu and updated to match AEGIS script. [Kisuka]
 //============================================================
 
-//ALBERTA
+// Alberta
 alberta,120,45,2	script	Ice Cream Maker::IceCreamer	85,{
 	mes "[Ice Cream Maker]";
 	mes "Fresh Ice Cream made with snow from Lutie!";
 	mes "Enjoy it now, it won't be on sale for long!";
-	mes "^0000FF100 Zeny^000000 Ice Cream,";
+	mes "^3355FF100 Zeny^000000 Ice Cream,";
 	mes "Ice Cream!";
 	next;
-	menu "Gimme Ice Cream!",-,"Cancel Trade",L_End;
-	
-		mes "[Ice Cream Maker]";
-		mes "Fresh Ice Cream made with snow from Lutie!";
-		mes "Everyone wants our delicious ice cream, but we have limited amount,";
-		mes "so you can only purchase 5 at a time!!";
-		next;
-		input @input;
-		mes "[Ice Cream Maker]";
-		if(@input<1) goto L_inpC;
-		if(@input>5) goto L_inpM;
-		if(Zeny< @input*100) goto L_NoZ;
-		set Zeny,Zeny-100*@input;
-		getitem 536,@input;
-		mes "Here you go  " +@input+ "  Ice Cream for you.";
+	if(select("Gimme Ice Cream!:Cancel Trade") == 2) {
+		mes "Are you sure you don't want any?";
+		mes "I won't be selling it for long,";
+		mes "and once I run out,";
+		mes "there won't be any more!!!";
 		close;
-		
-		L_inpC:
-			mes "Deal is canceled.";
-			close;
-		L_inpM:
-			mes "Sorry, but you can only buy 5 at a time.";
-			close;
-		L_NoZ:
-			mes "Sorry, but you need more money.";
+	}
+	mes "[Ice Cream Maker]";
+	mes "Fresh Ice Cream made with snow from Lutie!";
+	mes "Everyone wants our delicious ice cream, ";
+	mes "but we have a limited amount,";
+	mes "so you can only purchase 5 at a time!!";
+	next;
+	while(1) {
+		input .@input;
+		if(.@input < 1) {
+			mes "[Ice Cream Maker]";
+			mes "If you don't want to buy any,";
+			mes "could you please let the next customer";
+			mes "make a purchase?";
+			mes "Thank you.";
 			close;
-	L_End:
+		}
+		if(.@input > 5) {
+			mes "[Ice Cream Maker]";
+			mes "Ouch";
+			mes "You expect too much.";
+			mes "Dear customer,";
+			mes "If you eat more than 5 Ice creams,";
+			mes "If you might haveto make a lot of trips";
+			mes "to the bathroom tonight.";
+			next;		
+		}
+	}
+	if(Zeny<.@input*100) {
 		mes "[Ice Cream Maker]";
-		mes "Are you sure you don't want any?";
-		mes "I won't be selling it for long, and once I run out, there won't be anymore!!!";
+		mes "Dear customer, your wallet seems to be light.";
+		mes "Price is ^3355FF100 Zeny^000000 per ice cream.";
+		close;	
+	}
+	if(checkweight(536,.@amount) == 0) {
+		mes "[Ice Cream Maker]";
+		mes "Dear customer,you look like you're carrying a lot.";
+		mes "Ice Cream is fine,";
+		mes "but you must consider your weight";
+		mes "before making a purchase.";
 		close;
+	}
+	set Zeny,Zeny-100*.@input;
+	getitem 536,.@input;	// Ice_Cream
+	close;
 }
 
-//MORROC FIELD
+// Morroc Field
 moc_fild16,88,304,4	duplicate(IceCreamer)	Ice Cream Maker#2	85
 
-//MORROC
+// Morroc
 //morocc,160,144,4	duplicate(IceCreamer)	Ice Cream Maker#3	85
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index 6b645aed6..51c77d4bc 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -4,7 +4,7 @@
 //= Darkchild (1.1)
 //= Playtester (1.2)
 //===== Current Version: ===================================== 
-//= 2.8
+//= 2.9
 //===== Compatible With: ===================================== 
 //= eAthena 1.0+
 //===== Description: ========================================= 
@@ -43,6 +43,7 @@
 //= 2.6 Updated Alberta inn to official. [L0ne_W0lf]
 //= 2.7 Removed Morroc Inns as per episode 12.1. [L0ne_W0lf]
 //= 2.8 Removed Moscovia Inn; Its in quests/quest_moscovia.txt [Kisuka]
+//= 2.9 Added switch menus, updated to match AEGIS scripts. [Kisuka]
 //============================================================ 
 
 
@@ -113,7 +114,6 @@ ra_in01,376,69,4	script	Inn Keeper#Annie	931,{
 
 //====================== Lighthalzen =================================
 lhz_in02,230,284,4	script	Hotel Employee#01	86,{
-
 	mes "[Hotel Employee]";
 	mes "Welcome to";
 	mes "the Royal Dragon,";
@@ -121,43 +121,41 @@ lhz_in02,230,284,4	script	Hotel Employee#01	86,{
 	mes "finest accomodations";
 	mes "and the best service.";
 	next;
-	menu "Save Point",s_Save,"Rest - 5,000 zeny",s_Rest,"Cancel",-;
-
-	mes "[Hotel Employee]";
-	mes "Thank you and";
-	mes "have a nice day.";
-	close;
-
-s_Save:
-	savepoint "lhz_in02",209,275;
-	mes "[Hotel Employee]";
-	mes "Thank you, your";
-	mes "Respawn Point has";
-	mes "been saved here in";
-	mes "the Royal Dragon.";
-	close;
-
-s_Rest:
-	if(Zeny < 5000)goto s_NEnoughZ;
-	set Zeny,Zeny - 5000;
-	mes "[Hotel Employee]";
-	mes "Thank you~";
-	mes "I hope you enjoy";
-	mes "your stay in the";
-	mes "Royal Dragon.";
-	close2;
-	warp "lhz_in02",219,150;
-	percentheal 100,100;
-	sc_start SC_BLESSING,240000,10;
-	skilleffect AL_BLESSING,0;
-	end;
-
-s_NEnoughZ:
-	mes "[Hotel Employee]";
-	mes "I'm sorry but you do not";
-	mes "have enough zeny, please";
-	mes "come back when you do!";
-	close;
+	switch(select("Save Point:Rest - 5,000 zeny:Cancel")) {
+	case 1:
+		savepoint "lhz_in02",209,275;
+		mes "[Hotel Employee]";
+		mes "Thank you, your";
+		mes "Respawn Point has";
+		mes "been saved here in";
+		mes "the Royal Dragon.";
+		close;
+	case 2:
+		if(Zeny < 5000) {
+			mes "[Hotel Employee]";
+			mes "I'm sorry, but";
+			mes "you need 5,000 zeny";
+			mes "in order to check in.";
+			close;
+		}
+		set Zeny,Zeny - 5000;
+		mes "[Hotel Employee]";
+		mes "Thank you~";
+		mes "I hope you enjoy";
+		mes "your stay in the";
+		mes "Royal Dragon.";
+		close2;
+		warp "lhz_in02",219,150;
+		percentheal 100,100;
+		sc_start SC_BLESSING,240000,10;
+		skilleffect AL_BLESSING,0;
+		end;
+	case 3:
+		mes "[Hotel Employee]";
+		mes "Thank you and";
+		mes "have a nice day.";
+		close;
+	}
 }
 
 //======================== Hugel ====================================
@@ -175,20 +173,21 @@ ve_in,157,219,5	script	Inn Master#Receptionist	709,{
 	mes "most comfortable";
 	mes "inn here in Veins~";
 	next;
-	menu "Save",Msave, "Take a Rest -> 5000 zeny",Mrent, "Cancel",Mend;
-
-	Msave:
+	switch(select("Save:Take a Rest -> 5000 zeny:Quit")) {
+	case 1:
 		mes "[Inn Master]";
-		mes "Your respawn point";
+		mes "Your Respawn Point";
 		mes "has been saved in Veins.";
 		mes "Enjoy your stay in town~";
 		savepoint "ve_in",157,209;
 		close;
-	Mrent:
+	case 2:
 		mes "[Inn Master]";
 		if(Zeny < 5000){
-			mes "I'm sorry, but you don't have enough money to check in.";
-			mes "The service charge is 5,000 zeny.";
+			mes "I'm sorry, but I don't";
+			mes "think you have enough";
+			mes "money to check in. The";
+			mes "service charge is 5,000 zeny.";
 			close;
 		}
 		mes "Enjoy your stay~";
@@ -196,9 +195,11 @@ ve_in,157,219,5	script	Inn Master#Receptionist	709,{
 		set Zeny,Zeny - 5000;
 		percentheal 100,100;
 		warp "ve_in",184,228;
-
-	Mend:
+	case 3:
+		mes "[Inn Master]";
+		mes "Please come again.";
 		close;
+	}
 }
 
 //======================= Inn Function ==============================
@@ -208,9 +209,8 @@ function	script	F_InnMaid	{
 	mes getarg(1) + ".";
 	mes "How may I help you?";
 	next;
-	menu "Save",Msave, "Take a Rest -> 5000 zeny",Mrent, "Cancel",Mend;
-
-	Msave:
+	switch(select("Save:Take a Rest -> 5000 zeny:Cancel")) {
+	case 1:
 		mes getarg(0);
 		mes "Your respawn point";
 		mes "has been saved.";
@@ -218,13 +218,10 @@ function	script	F_InnMaid	{
 		mes "please come again.";
 		savepoint getarg(2),getarg(3),getarg(4);
 		close;
-	Mrent:
+	case 2:
 		mes getarg(0);
 		if(Zeny < 5000){
-			mes "I'm sorry, but the service charge";
-			mes "is 5,000 zeny. Please make sure";
-			mes "that you have enough money to check";
-			mes "in next time, okay?";
+			mes "I'm sorry, but the service charge is 5,000 zeny. Please make sure that you have enough money to check in next time, okay?";
 			close;
 		}
 		mes "Thank you.";
@@ -234,7 +231,7 @@ function	script	F_InnMaid	{
 		set Zeny,Zeny - 5000;
 		percentheal 100,100;
 		return;
-
-	Mend:
+	case 3:
 		close;
+	}
 }
diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt
index ad2adaddd..196405ff0 100644
--- a/npc/merchants/kunai_maker.txt
+++ b/npc/merchants/kunai_maker.txt
@@ -1,93 +1,101 @@
 //===== eAthena Script =======================================
-//= Kunai "Trader" @ que_ng
+//= Kunai Merchant Kashin
 //===== By: ==================================================
 //= eAthena dev team
 //===== Current Version: =====================================
-//= 1.2a
+//= 1.3
 //===== Compatible With: =====================================
-//= eAthena 1.0
+//= eAthena SVN
 //===== Description: =========================================
-//= NPC that trades you a few shurikens + ninja stones for 
-//= elemental kunais.
+//= Trades a few shurikens + ninja stones for elemental kunai.
 //===== Additional Comments: =================================
 //= 1.0 Added the npc. It uses a function that sends the item 
 //=	  id of the 2 required items plus the amount. Can trade
 //= 	  up to 500 units (5,000 kunais) at once. [erKURITA]
 //= 1.1 Officialized script [Playtester]
 //= 1.2a Optimized/cleaned up a bit [ultramage]
+//= 1.3 Updated to match AEGIS script. [Kisuka]
 //============================================================
 
 que_ng,72,29,3	script	Kunai Merchant Kashin	83,{
-
-	mes "[Kashin]";	
-	if(BaseJob != Job_Ninja) {
-		mes "I am Kashin of the Wind. I distribute trade items to the shadows.";
-		next;
+	if(BaseJob == Job_Ninja) {
 		mes "[Kashin]";
-		mes "It doesn't seem like you are a Ninja... Just take a good look around and be on your way.";
-		close;
+		mes "I am Kashin, distributor";
+		mes "of Kunai for Ninjas. Take";
+		mes "a look around and let me";
+		mes "know if you're interested";
+		mes "in any of my wares.";
+		next;
+		switch(select("10 Fell Poison Kunai:10 Icicle Kunai:10 High Wind Kunai:10 Black Earth Kunai:10 Heat Wave Kunai:Cancel")) {
+		case 1: callfunc "Kunai_Trade",13250,20,7524,1,13259; break;
+		case 2: callfunc "Kunai_Trade",13251,8,7522,2,13255; break;
+		case 3: callfunc "Kunai_Trade",13252,4,7523,2,13257; break;
+		case 4: callfunc "Kunai_Trade",13253,2,7524,1,13256; break;
+		case 5: callfunc "Kunai_Trade",13254,1,7521,2,13258; break;
+		case 6:
+			mes "[Kashin]";
+			mes "Well then, thank you";
+			mes "for visiting my shop.";
+			mes "Please come to me when";
+			mes "you need to buy some";
+			mes "Kunais. Goodbye for now~";
+			close;
+		}
 	}
-	mes "I'm Kashin!";
-	mes "If you're ever short on Shurikens, come and see me.";
-	next;
 	mes "[Kashin]";
-	mes "What will it be?";
-	mes "Choose what you want.";
-	next;
-
-	switch(select("Poison Kunais:Frost Kunais:Wind Kunais:Earth Kunais:Fire Kunais:Cancel")) {
-	//usage: callfunc "Kunai_Trade",itemreqid1,itemreqct1,itemreqid2,itemreqct2,itemidtrade;
-	case 1: callfunc "Kunai_Trade",13250,20,7524,1,13259; break;
-	case 2: callfunc "Kunai_Trade",13251,8,7522,2,13255; break;
-	case 3: callfunc "Kunai_Trade",13252,4,7523,2,13257; break;
-	case 4: callfunc "Kunai_Trade",13253,2,7524,1,13256; break;
-	case 5: callfunc "Kunai_Trade",13254,1,7521,2,13258; break;
-	default:
-		mes "[Kashin]";
-		mes "Hmm~ Ok~";
-		mes "Come again~";
-		mes "I, Kashin of the Wind, will always be at this place.";
-		close;
-	}
+	mes "I am Kashin, distributor";
+	mes "of Kunai for Ninjas. If you";
+	mes "have any friends that are";
+	mes "Ninjas, then you might";
+	mes "want to tell them about me.";
 	close;
 }
 
 function	script	Kunai_Trade	{
-	
 	mes "[Kashin]";
-	mes "If you give me "+getarg(1)+" "+getitemname(getarg(0))+" and "+getarg(3)+" "+getitemname(getarg(2))+", I'll give you a pack of 10 "+getitemname(getarg(4))+".";
+	mes "You can exchange";
+	mes ""+getarg(1)+" "+getitemname(getarg(0))+" and";
+	mes ""+getarg(3)+" "+getitemname(getarg(2))+" for every";
+	mes "set of 10 "+getitemname(getarg(4))+".";
 	next;
 	mes "[Kashin]";
-	mes "You can trade up to 500 packs at a time.";
-	mes "If you don't want to trade, just enter 0 as the amount.";
+	mes "I can only give you a maximum of 500 sets of Kunais at a time.";
+	mes "If you want to cancel the trade, then please enter ''0.'' How many";
+	mes "Kunai sets would you like?";
 	next;
 	input .@amount;
-
-	mes "[Kashin]";
-	if(.@amount < 1) {
-		mes "Hmm~ Ok~";
-		mes "Come again~";
-		mes "I, Kashin of the Wind, will always be at this place.";
-		close;
-	}
-	if(.@amount > 500) {
-		mes "You've exceeded the input amount!";
-		mes "Enter a valid number next time~!";
+	if(.@amount < 1 || .@amount > 500) {
+		mes "[Kashin]";
+		mes "Eh? I'm sorry, but";
+		mes "I can't give you that";
+		mes "many Kunai sets. Please";
+		mes "enter a value less than 500.";
 		close;
 	}
 	if(countitem(getarg(0)) < .@amount*getarg(1) || countitem(getarg(2)) < .@amount*getarg(3)) {
-		mes "Hmm... this is no good~";
-		mes "You don't have enough materials to trade in for the amount of Kunai's that you want.";
-		mes "Bring some more if you want this amount.";
+		mes "[Kashin]";
+		mes "Hmm, you don't have";
+		mes "enough items for this";
+		mes "Kunai exchange. Please";
+		mes "check your items again.";
 		close;
  	}
 	if(checkweight(getarg(4), .@amount*10) == 0) {
-		mes "Your bag is too full to carry the trade items. Come back after you made room for the traded items.";
+		mes "[Kashin]";
+		mes "Hmm, it seems like your";
+		mes "Inventory doesn't have";
+		mes "enough space to store";
+		mes "more items. You better";
+		mes "free up some space first.";
 		close;
 	}
-	mes "Ok~ Very well!";
-	mes "Amount verified!";
-	mes "Here are your traded items.";
+	mes "[Kashin]";
+	mes "Great, everything is in";
+	mes "order, so let's go ahead";
+	mes "and complete this trade.";
+	mes "I'm sure that you'll be";
+	mes "quite satisfied with";
+	mes "these Kunais.";
 	delitem getarg(0),getarg(1)*.@amount;
 	delitem getarg(2),getarg(3)*.@amount;
 	getitem getarg(4),10*.@amount;
diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt
index 27d23b865..8690a9dee 100644
--- a/npc/merchants/old_pharmacist.txt
+++ b/npc/merchants/old_pharmacist.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= DZeroX
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= eAthena SVN Trunk
 //===== Description: =========================================
@@ -22,9 +22,10 @@
 //= 1.1b Fixed a bug in Orange Potion creating. Copy&Pasting = bad. [L0ne_W0lf]
 //= 1.2 Added checkweight, and input min/max values. [L0ne_W0lf]
 //= 1.3 Fixed minor condition check bug. (bugreport:597) [L0ne_W0lf]
+//= 1.4 Updated to match AEGIS script. [Kisuka]
 //============================================================
 
-alberta_in,16,28,4	script	Old Pharmacist	61,{
+alberta_in,16,28,4	script	Pharmacist	61,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a moment! -";
 		mes "- Currently you're carrying -";
@@ -34,12 +35,13 @@ alberta_in,16,28,4	script	Old Pharmacist	61,{
 		close;
 	}
 	mes "[Old Pharmacist]";
-	mes "Err....Are you a customer...?";
-	switch(select("Make Potion","Talk.","Instruction of making potions","Cancel")) {
+	mes "Ummmm...";
+	mes "What brings you here...?";
+	switch(select("Make Potion","Talk.","Mixing Information","Cancel")) {
 		case 1:
 			next;
 			set .@weight,MaxWeight-Weight;
-			if ((.@weight) < 10000) {
+			if ((.@weight) < 5000) {
 				mes "[Old Pharmacist]";
 				mes "Why are you carrying these so many!";
 				mes "Don't be greedy, carry only as much you need!";
@@ -86,14 +88,11 @@ alberta_in,16,28,4	script	Old Pharmacist	61,{
 									close;
 								}
 								set Zeny,Zeny-(.@max*5);
-								delitem 507,.@max;
-								delitem 508,.@max;
-								delitem 713,.@max;
-								getitem 502,.@max; 
-								mes "[Old Pharmacist]";
-								mes "Here. Take them.";
-								mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
-								close;
+								delitem 507,.@max;	// Red_Herb
+								delitem 508,.@max;	// Yellow_Herb
+								delitem 713,.@max;	// Empty_Bottle
+								getitem 502,.@max;	// Orange_Potion
+								break;
 							case 2:
 								next;
 								mes "[Old Pharmacist]";
@@ -119,13 +118,11 @@ alberta_in,16,28,4	script	Old Pharmacist	61,{
 								}
 								next;
 								set Zeny,Zeny-(.@amount*5);
-								delitem 507,.@amount;
-								delitem 508,.@amount;
-								delitem 713,.@amount;
-								getitem 502,.@amount; 
-								mes "[Old Pharmacist]";
-								mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
-								close;
+								delitem 507,.@amount;	// Red_Herb
+								delitem 508,.@amount;	// Yellow_Herb
+								delitem 713,.@amount;	// Empty_Bottle
+								getitem 502,.@amount; 	// Orange_Potion
+								break;
 							case 3:
 								next;
 								mes "[Old Pharmacist]";
@@ -135,6 +132,9 @@ alberta_in,16,28,4	script	Old Pharmacist	61,{
 								mes "Get lost!";
 								close;
 						}
+							mes "[Old Pharmacist]";
+							mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
+							close;
 					case 3:
 						callsub L_making,508,10,503;
 					case 4:
@@ -150,8 +150,8 @@ alberta_in,16,28,4	script	Old Pharmacist	61,{
 						mes "Bleh!";
 						mes "Get lost!";
 						close;
-					}
 				}
+			}
 		case 2:
 			mes "[Old Pharmacist]";
 			mes "With medicine, you can increase a person's ability to regenerate. But, they're only good up to a point. *Sigh* I'm starting to think of the days when I was young. I must be getting old.";
@@ -215,12 +215,9 @@ L_making:
 			}
 			set Zeny,Zeny-(.@max*getarg(1));
 			delitem getarg(0),.@max*2;
-			delitem 713,.@max;
+			delitem 713,.@max;	// Empty_Bottle
 			getitem getarg(2),.@max; 
-			mes "[Old Pharmacist]";
-			mes "Here. Take them.";
-			mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
-			close;
+			break;
 		case 2:
 			next;
 			mes "[Old Pharmacist]";
@@ -247,11 +244,9 @@ L_making:
 			next;
 			set Zeny,Zeny-(.@amount*getarg(1));
 			delitem getarg(0),.@amount*2;
-			delitem 713,.@amount;
+			delitem 713,.@amount;	// Empty_Bottle
 			getitem getarg(2),.@amount; 
-			mes "[Old Pharmacist]";
-			mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
-			close;
+			break;
 		case 3:
 			next;
 			mes "[Old Pharmacist]";
@@ -261,4 +256,7 @@ L_making:
 			mes "Get lost!";
 			close;
 	}
+		mes "[Old Pharmacist]";
+		mes "Here you go. It's all done so you can take it. But remember! Abusing medicine is not good.";
+		close;
 }