* Rather large Kafra update. (May need further testing)

- Updated a good portion of the kafra functions.
- Added proper dialog for most functions.
- Updated guild Kafras and some o f their locations. 
* Updated all Guide NPCs. They are now mostly 100% official.
- Renamed some of the old files to make them look better, IE: yun to juno.
- Added Kunlun and Ayotaya guides.
* Added the Einbech tool Dealer since it seemed to had gotten lost when I updated shops.
* Updated Dye Maker and Hair Dyer to official. 

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

3 files changed, 298 insertions, 392 deletions

diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt
index e34367421..9e99bdc3d 100644
--- a/npc/merchants/dye_maker.txt
+++ b/npc/merchants/dye_maker.txt
@@ -1,277 +1,187 @@
 //===== eAthena Script ======================================= 
 //= Dye Maker
 //===== By: ================================================== 
-//= kobra_k88
+//= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1 
+//= 1.2
 //===== Compatible With: ===================================== 
-//= eAthena 7.15 +
+//= eAthena SVN
 //===== Description: ========================================= 
-//=
+//= [Aegis Conversion]
 //===== Additional Comments: ================================= 
 //= Fully working
 //= 1.1 Spell Checked [Nexon] 
+//= 1.2 Rescripted to Aegis 10.3 standard. [L0ne_W0lf]
 //============================================================ 
 
-
-
-// Dye Maker JavaDullihan =======================
-morocc_in,146,99,2	script	Dye Maker JavaDullihan	122,{
-	mes "[Dye Maker JavaDullihan]";
-	mes "Oh... What a Beautiful day today.";
-	mes "This is a perfect day to make Dyestuffs";
+morocc_in,146,99,3	script	Java Dullihan	58,{
+	set .@now_weight,MaxWeight-Weight;
+	if (.@now_Weight < 200) {
+		mes "- Wait a moment! -";
+		mes "- Currently you're carrying -";
+		mes "- too many items with you. -";
+		mes "- Please come back later -";
+		mes "- after you put some items into kafra storage. -";
+		close;
+	}
+	mes "[Dye Maker Java Dullihan]";
+	mes "Wow...";
+	mes "Such a nice day. Days like this are perfect to make dyes.";
 	next;
-	menu "-Talk",M_Talk,"-Make Dyestuffs",M_Make,"-Cancel",M_End;
-	
-	M_Talk:
-		mes "[Dye Maker JavaDullihan]";
-		mes "I don't have much to say...";
-		next;
-		mes "[Dye Maker JavaDullihan]";
-		mes "But if you want to know about my past, I'm sure I have a few stories to tell.";
-		next;
-		mes "[Dye Maker JavaDullihan]";
-		mes "Would you like to here some?";
+	switch(select("Talk:Make Dyestuffs:Cancel")) {
+	case 1:
+		mes "[Dye Maker Java Dullihan]";
+		mes "Erm, I don't really have much to say to you. But, if you would like me to tell you about my life, I can do that. It's a little long and boring, but would you like to listen?";
 		next;
-		menu "-Sure, why not.",sM_0a,"-Maybe some other time.",sM_0b;
-		
-		sM_0a:
-			mes "[Dye Maker JavaDullihan]";
-			mes "My father had been making dyestuffs since I was young... ..";
-			mes "I can still picture him making dyestuffs all day long.";
+		if (select("Listen:Don't Listen") == 1) {
+			mes "[Dye Maker Java Dullihan]";
+			mes "As long as I can remember, my father has been making dyes. He used to spend countless hours making dyes of different colors. Even when my mother passed away, he never stopped.";
 			next;
-			mes "[Dye Maker JavaDullihan]";
-			mes "Even during the time of my mother's passing, my father kept making dyestuffs without end.";
-			mes "This made me angry at him.  How could he keep making dyestuffs at a time like that?";
+			mes "[Dye Maker Java Dullihan]";
+			mes "At one point in my life, I became rebellious and ran away from home. I didn't want to be stuck to the family business and wanted to try other things.";
 			next;
-			mes "[Dye Maker JavaDullihan]";
-			mes "I just couldn't understand what my father was thinking.  I became very disappointed in him.";
-			mes "My fathers actions made me despise Dye Making, so I ran away from home.  I survived by doing a variety of odd jobs.";
+			mes "[Dye Maker Java Dullihan]";
+			mes "Anyways...";
+			mes "I eventually wound up back home to carry on the family tradition, making dyes for 15 years already. I guess it was really in my blood.";
 			next;
-			mes "[Dye Maker JavaDullihan]";
-			mes "However, as you can see, I ended up becoming a Dye Maker just like my father.";
-			mes "It's been 15 years since I first started making these goddamn things...";
+			mes "[Dye Maker Java Dullihan]";
+			mes "Something I realized these days is that now I can understand my father. Why my father devoted everything to making dyes...";
 			next;
-			mes "[Dye Maker JavaDullihan]";
-			mes "Now that I've been doing this for as long as I have... I think I can finally understand why my father fell in love with his job.";
+			mes "[Dye Maker Java Dullihan]";
+			mes "In the middle of all that tedious and hard work, he probably felt the magic of those colors passing on so many dreams for other people.";
 			next;
-			mes "[Dye Maker JavaDullihan]";
-			mes "Why he sacrificed everything he had for this job...";
+			mes "[Dye Maker Java Dullihan]";
+			mes "It was probably for those dreams that he tried so hard to make dyes for his customers...";
 			next;
-			mes "[Dye Maker JavaDullihan]";
-			mes "Maybe it was because of how the colors got more and more beautiful each time...";
-			mes "Maybe he wanted to find his own perfect color...";
+			mes "[Dye Maker Java Dullihan]";
+			mes "Heh... How do I know this? Well, that's the way I feel right now. Since a couple years ago, I've been able to hear what the colors were saying...";
 			next;
-			mes "[Dye Maker JavaDullihan]";
-			mes "I now have his feel for the colors... because... I am working with the same passion he had when he was living.";
-			mes "I am able to feel the colors from within my soul.  I know it's hard to understand, but you will see what I mean.";
-			next;
-			mes "[Dye Maker JavaDullihan]";
-			mes "Father, I make these dyes for you....";
-			close;
-
-		sM_0b:
-			mes "[Dye Maker JavaDullihan]";
-			mes "Hahahaha... I guess I can't blame ya, who wants to here about a plain old dye maker's life anyhow.... Hahahaha...";
+			mes "[Dye Maker Java Dullian]";
+			mes "Just watch. Someday, I'm going to succeed in making the color my father wanted to, but never got the chance to make.";
 			close;
+		}
+		mes "[Dye Maker Java Dullihan]";
+		mes "Ahahahaha...";
+		mes "Well, I guess no one would want to listen to a measly dyemaker's story anyway. Hahaha....";
+		close;
 
-	M_Make:
-		mes "[Dye Maker JavaDullihan]";
-		mes "Alright! I will make the exact color you want.  The cost of the dyestuff will depend on its quality.";
-		mes "Don't not be itimitaded by the prices, they are all my Masterpieces.";
+	case 2:
+		mes "[Dye Maker Java Dullihan]";
+		mes "Great! If you want it, I'll make it for you. I promise I'll make you the color you want. But what color dye would you like to make? The fee is different depending on the color.";
 		next;
-		mes "[Dye Maker JavaDullihan]";
-		mes "So what color do you want?";
+		mes "[Dye Maker Java Dullihan]";
+		mes "Why, do you ask? Just remember that there are colors that are easy to make, and those that require more effort and work. Please don't think the fee is too expensive.";
 		next;
-		menu 	"-Scarlet Dyestuffs",sM_Scarlet, "-Lemon Dyestuffs",sM_Lemon, "-Cobaltblue Dyestuffs",sM_Cobaltblue,
-			"-Darkgreen Dyestuffs",sM_Darkgreen, "-Orange Dyestuffs",sM_Orange, "-Violet Dyestuffs",sM_Violet,
-			"-White Dyestuffs",sM_White, "-Black Dyestuffs",sM_Black;
-		
-		sM_Scarlet:
-			mes "[Dye Maker JavaDullihan]";
-			mes "Hmm... To make a Scarlet Dyestuffs, I need ^0000ff30 Red Herbs, 1 Counteragent and 1 Empty Bottle^000000.";
-			mes "The cost of labor will be 3000 Zeny.  Are you still interested?";
-			next;
-			menu "Make Dyestuffs",sm_Make0, "Cancel",sm_Cancel;
-			
-			sm_Make0:
-				mes "[Dye Maker JavaDullihan]";
-				if((countitem(507) < 30) || (countitem(973) < 1) || (countitem(713) < 1)) goto sl_LowItems;
-				if(Zeny < 3000) goto sl_LowZeny;
-				set Zeny, Zeny - 3000;
-				delitem 507,30;
-				delitem 973,1;
-				delitem 713,1;
-				getitem 975,1;
-				mes "Missing text.";
-				mes "Under development";
-				close;
-
-		sM_Lemon:
-			mes "[Dye Maker JavaDullihan]";
-			mes "Um... to make a Lemon Dyestuffs I need ^0000ff30 Yellow Herbs, 1 Counteragent, and 1 Empty Bottle^000000.";
-			mes "The cost of labor will be 3000 Zeny.  Are you still interested?";
-			next;
-			menu "Make Dyestuffs",sm_Make1,"Cancel",sm_Cancel;
-			
-			sm_Make1:
-				mes "[Dye Maker JavaDullihan]";
-				if((countitem(508) < 30) || (countitem(973) < 1) || (countitem(713) < 1)) goto sl_LowItems;
-				if(Zeny < 3000) goto sl_LowZeny;
-				mes "Missing text.";
-				mes "Under development";
-				delitem 508,30;
-				delitem 973,1;
-				delitem 713,1;
-				set Zeny, Zeny - 3000;
-				getitem 976,1;
-				close;
-
-		sM_Cobaltblue:
-			mes "[Dye Maker JavaDullihan]";
-			mes "Hmm... To make a Cobaltblue Dyestuffs, I need ^0000ff20 Blue Herbs, 1 Counteragent, and 1 Empty Bottle^000000.";
-			mes "Blue Herbs are a little bit difficult to work with, so the cost of labor will be 3500 Zeny.  Are you still interested?";
-			next;
-			menu "Make Dyestuffs",sm_Make2,"Cancel",sm_Cancel;
-			
-			sm_Make2:
-				mes "[Dye Maker JavaDullihan]";
-				if((countitem(510) < 20) || (countitem(973) < 1) || (countitem(713) < 1)) goto sl_LowItems;
-				if(Zeny < 3500) goto sl_LowZeny;
-				mes "Missing text.";
-				mes "Under development";
-				delitem 510,20;
-				delitem 973,1;
-				delitem 713,1;
-				set Zeny, Zeny - 3500;
-				getitem 978,1;
-				close;
-
-		sM_Darkgreen:
-			mes "[Dye Maker JavaDullihan]";
-			mes "Hmm... To make a Darkgreen Dyestuffs, I need ^0000ff5 Blue Herbs, 20 Green Herbs, 20 Yellow Herbs, 1 Counteragent, 1 Mixture, and 1 Empty Bottle^000000.";
-			mes "There are a lot of ingredients so please try to remember them all.  The cost of labore will be 5000 Zeny.  Are you still interested?";
-			mes "Ok are you ready?";
-			next;
-			menu "Make Dyestuffs",sm_Make3,"Cancel",sm_Cancel;
-
-			sm_Make3:
-				mes "[Dye Maker JavaDullihan]";
-				if((countitem(510) < 5) || (countitem(511) < 20) || (countitem(508) < 20) || (countitem(973) < 1) || (countitem(974) < 1) || (countitem(713)<1)) goto sl_LowItems;
-				if(Zeny < 5000) goto sl_LowZeny;
-				mes "Missing text.";
-				mes "Under development";
-				delitem 510,5;
-				delitem 511,20;
-				delitem 508,20;
-				delitem 973,1;
-				delitem 974,1;
-				delitem 713,1;
-				set Zeny, Zeny - 5000;
-				getitem 979,1;
-				close;
-
-		sM_Orange:
-			mes "[Dye Maker JavaDullihan]";
-			mes "Hmm... To make a Orange Dyestuffs, I need ^0000ff20 Red Herbs, 20 Yellow Herbs, 1 Counteragent, 1 Mixture, and 1 Empty Bottle^000000.";
-			mes "The cost of labor is 5000 Zeny.  Are you still interested?";
-			next;
-			menu "Make Dyestuffs",sm_Make4,"Cancel",sm_Cancel;
-
-			sm_Make4:
-				mes "[Dye Maker JavaDullihan]";
-				if((countitem(507) < 20) || (countitem(508) < 20) || (countitem(973) < 1) || (countitem(974) < 1) || (countitem(713) < 1)) goto sl_LowItems;
-				if(Zeny < 5000) goto sl_LowZeny;
-				mes "Missing text.";
-				mes "Under development";
-				delitem 507,20;
-				delitem 508,20;
-				delitem 973,1;
-				delitem 974,1;
-				delitem 713,1;
-				set Zeny, Zeny - 5000;
-				getitem 980,1;
-				close;
-
-		sM_Violet:
-			mes "[Dye Maker JavaDullihan]";
-			mes "Hmm... To make a Violet Dyestuffs, I need ^0000ff10 Blue Herbs, 30 Red Herbs, 1 Counteragent, 1 Mixture, and 1 Empty Bottle^000000.";
-			mes "The cost of labor will be 5000 Zeny.  Are you still interested?";
-			next;
-			menu "Make Dyestuffs",sm_Make5,"Cancel",sm_Cancel;
-
-			sm_Make5:
-				mes "[Dye Maker JavaDullihan]";
-				if((countitem(510) < 10) || (countitem(507) < 20) || (countitem(973) < 1) || (countitem(974) < 1) || (countitem(713) < 1)) goto sl_LowItems;
-				if(Zeny < 5000) goto sl_LowZeny;
-				mes "Missing text.";
-				mes "Under development";
-				delitem 510,10;
-				delitem 507,20;
-				delitem 973,1;
-				delitem 974,1;
-				delitem 713,1;
-				set Zeny, Zeny - 5000;
-				getitem 981,1;
-				close;
-
-		sM_White:
-			mes "[Dye Maker JavaDullihan]";
-			mes "Umm... To make a White Dyestuffs, I need ^0000ff30 White Herbs, 1 Counteragent, and 1 Empty Bottle^000000.";
-			mes "The cost of labor will be 3000 Zeny.  Are you still interested?";
-			next;
-			menu "Make Dyestuffs",sm_Make6,"Cancel",sm_Cancel;
-
-			sm_Make6:
-				mes "[Dye Maker JavaDullihan]";
-				if((countitem(509) < 30) || (countitem(973) < 1) || (countitem(713) < 1)) goto sl_LowItems;
-				if(Zeny < 3000) goto sl_LowZeny;
-				mes "Missing text.";
-				mes "Under development";
-				delitem 509,30;
-				delitem 973,1;
-				delitem 713,1;
-				set Zeny, Zeny - 3000;
-				getitem 982,1;
-				close;
-
-		sM_Black:
-			mes "[Dye Maker JavaDullihan]";
-			mes "Hmm... To make a Black Dyestuffs, I need ^0000ff30 Red, Yellow, and Green Herbs, 5 Blue Herbs, 1 Counteragent, 1 Mixture, and 1 Empty Bottle^000000.";
-			mes "This is the most difficult and time consuming dye to make, so I will have to charge a 7000 Zeny labor fee.  Are you still interested?";
-			next;
-			menu "Make Dyestuffs",sm_Make7,"Cancel",sm_Cancel;
-
-			sm_Make7:
-				mes "[Dye Maker JavaDullihan]";
-				if((countitem(507) < 30) || (countitem(508) < 30) || (countitem(511) < 30) || (countitem(510) < 5) || (countitem(973) < 1) || (countitem(974) < 1) || (countitem(713)<1)) goto sl_LowItems;
-				if(Zeny < 7000) goto sl_LowZeny;
-				mes "Missing text.";
-				mes "Under development";
-				delitem 507,30;
-				delitem 508,30;
-				delitem 511,30;
-				delitem 510,5;
-				delitem 973,1;
-				delitem 974,1;
-				delitem 713,1;
-				set Zeny, Zeny - 7000;
-				getitem 983,1;
-				close;
-
-
-			sl_LowItems:
-				mes "Hmm... you don't have enough of the items needed for the dyestuffs.  Come back when you do.";
-				close;
-
-			sl_LowZeny:
-				mes "You don't have enough zeny.  I need to make a living ya know....";
-				close;
+		mes "[Dye Maker Java Dullihan]";
+		mes "The color of the dye is special, made with all my heart and soul.";
+		next;
+		switch(select("Scarlet Dyestuffs:Lemon Dyestuffs:Cobaltblue Dyestuffs:Darkgreen Dyestuffs:Orange Dyestuffs:Violet Dyestuffs:White Dyestuffs:Black Dyestuffs:Cancel")) {
+		case 1: callsub S_MakeDye,1,1; break;
+		case 2: callsub S_MakeDye,2,1; break;
+		case 3: callsub S_MakeDye,3,2; break;
+		case 4: callsub S_MakeDye,4,3; break;
+		case 5: callsub S_MakeDye,5,4; break;
+		case 6: callsub S_MakeDye,6,4; break;
+		case 7: callsub S_MakeDye,7,4; break;
+		case 8: callsub S_MakeDye,8,4; break;
+		case 9:
+			mes "[Dye Maker Java Dullihan]";
+			mes "Eeeehhhh!! What's this? You change your mind now!? So disappointing...";
+			close;
+		}
 
-			sm_Cancel:
-				mes "[Dye Maker JavaDullihan]";
-				mes "How could you have change your mind so quickly?... oh boy...";
-				close;
-	M_End:
+	case 3:
+		mes "[Dye Maker Java Dullihan]";
+		mes "I'm not bragging or anything. But I have the skills to make dyestuff. If you ever need dyestuff, please come to me. I'll make them for you at a reasonable price.";
+		close;
+	}
+
+S_MakeDye:
+	mes "[Dye Maker Java Dullihan]";
+	switch(getarg(0)) {
+	case 1:
+		mes "Mmm... I need 30 Red Herbs, 1 Counteragent, and 1 Empty Bottle to make Red Dyestuffs. The fee is only 3000 zeny to make it.";
+		setarray .@items[0], 507,30, 0,0, 0,0, 0,0, 0,0;
+		set .@cost,3000;
+		set .@dyestuff,975;
+		break;
+	case 2:
+		mes "Mmm... I need 30 Yellow Herbs, 1 Couneragent, and 1 Empty Bottle to make Lemon Dyestuffs. The fee is only 3000 zeny to make it.";
+		setarray .@items[0], 508,30, 0,0, 0,0, 0,0, 0,0;
+		set .@cost,3000;
+		set .@dyestuff,976;
+		break;
+	case 3:
+		mes "Mmm... I need 20 Blue Herbs, 1 Counteragent, and 1 Empty Bottle to make Cobaltblue Dyestuff. It's hard to use the Blue Herb, so the fee is going to be 3500 zeny.";
+		setarray .@items[0], 510,20, 0,0, 0,0, 0,0, 0,0;
+		set .@cost,3500;
+		set .@dyestuff,978;
+		break;
+	case 4:
+		mes "Mmm... I need 5 Blue Herbs, 20 Green Herbs, 20 Yellow Herbs, 1 Counteragent, 1 Mixture, and 1 Empty Bottle to make Darkgreen Dyestuffs. Don't get all of the materials confused. The fee is only 5000 zeny.";
+		setarray .@items[0], 510,5, 511,20, 508,20, 974,1, 0,0;
+		set .@cost,5000;
+		set .@dyestuff,979;
+		break;
+	case 5:
+		mes "Mmm... I need 20 Red Herbs, 20 Yellow Herbs, 1 Counteragent, 1 Mixture, and 1 Empty Bottle to make Orange Dyestuff. The fee is going to be 5000 zeny.";
+		setarray .@items[0], 507,20, 508,20, 974,1, 0,0, 0,0;
+		set .@cost,5000;
+		set .@dyestuff,980;
+		break;
+	case 6:
+		mes "Mmm... I need 10 Blue Herbs, 30 Red Herbs, 1 Counteragent, 1 Mixture, and 1 Empty Bottle to make Violet Dyestuffs. The fee will be 5000 zeny.";
+		setarray .@items[0], 510,10, 507,30, 974,1, 0,0, 0,0;
+		set .@cost,5000;
+		set .@dyestuff,981;
+		break;
+	case 7:
+		mes "Mmm... I need 30 White Herbs, 1 Counteragent, and 1 Empty bottle to make White Dyestuffs. The fee will be 3000 zeny.";
+		setarray .@items[0], 509,30, 0,0, 0,0, 0,0, 0,0;
+		set .@cost,3000;
+		set .@dyestuff,982;
+		break;
+	case 8:
+		mes "Mmm... I need 30 of each Red, Yellow, and Green Herb, 5 Blue Herbs, 1 Counteragent, 1 Mixture, and 1 Empty Bottle. The process takes longer and more effort than the others, so it is going to be 7000 zeny.";
+		setarray .@items[0], 507,30, 508,30, 511,30, 510,5, 974,1;
+		set .@cost,7000;
+		set .@dyestuff,983;
+		break;
+	}
+	next;
+	mes "[Dye Maker Java Dullihan]";
+	switch(getarg(1)) {
+	case 1: mes "Ah! I think you would have everything ready. Would you like to start the process?"; break;
+	case 2: mes "Okay! I believe you would have everything ready. Would you like to start the process?"; break;
+	case 3: mes "Okay! I believe you would have everything ready. Shall we begin the process?"; break;
+	case 4: mes "Okay! I believe you would have everything prepared. Would you like to start the process?"; break;
+	}
+	next;
+	if (select("Make Dyestuffs:Cancel") == 1) {
+		if (.@item[0] < .@item[1] || .@item[2] < .@item[3] || .@item[4] < .@item[5] || .@item[6] < .@item[7] || .@item[8] < .@item[9] || countitem(973)== 0 || countitem(713) == 0 || Zeny < .@cost) {
+			mes "[Dye Maker Java Dullihan]";
+			mes "Hmmm. Not enough...";
+			mes "I don't think I'll be able to make the color you want with those materials. Why don't you go get some more materials...?";
+			close;
+		}
+		delitem .@item[0],.@item[1];
+		delitem .@item[2],.@item[3];
+		delitem .@item[4],.@item[5];
+		delitem .@item[6],.@item[7];
+		delitem .@item[8],.@item[9];
+		delitem 973,1; //Counteragent
+		delitem 713,1; //Empty Bottle
+		set zeny,zeny-.@cost;
+		getitem .@dyestuff,1;
+		mes "[Dye Maker Java Dullihan]";
+		mes "Hmm... It came out pretty well. A very rich color. Of course I'll be trying harder to make a more charming color...";
+		next;
+		mes "[Dye Maker Java Dullihan]";
+		mes "Well, then. Stop by whenever you need more dyes.";
 		close;
-}
+	}
+	mes "[Dye Maker Java Dullihan]";
+	mes "Eeeehhhh!! What's this?";
+	mes "You change your mind now!? So disappointing...";
+	return;
+}
\ No newline at end of file
diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt
index da8ec57ec..82cb21986 100644
--- a/npc/merchants/hair_dyer.txt
+++ b/npc/merchants/hair_dyer.txt
@@ -1,158 +1,152 @@
 //===== eAthena Script ======================================= 
 //= Hair Dyer
 //===== By: ================================================== 
-//= kobra_k88
+//= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
-//= eAthena 7.15 +
+//= eAthena SVN
 //===== Description: ========================================= 
 //= Hair Dyer with standard palletes
 //===== Additional Comments: ================================= 
 //= Fully working
 //= 1.1 Bugfix: fixed missing menu label LEnd->M_End [Lupus]
+//= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //============================================================ 
 
-
-
-
-// HairDyer Jovovich -----------------------------------------------------
-prt_in,243,168,4	script	HairDyer Jovovich	91,{
-	mes "[HairDyer Jovovich]";
-	mes "Welcome to my Hair Dying shop.";
+prt_in,243,168,4	script	Jovovich	91,{
+	mes "[Hairdresser Jovovich]";
+	mes "Welcome~!";
+	mes "How may I help you?";
 	next;
-	mes "[HairDyer Jovovich]";
-	mes "Oh my..... your hair does not look like it's in good condition.  I think it needs some special care.  Come have a seat.";
-	qMenu0:
+	mes "[Hairdresser Jovovich]";
+	if (sex) mes "Oh, no! Your hair is damaged. It seems as if you may need professional treatment. Come sit over here, please. Come.";
+	else {
+		if (rand(20) > 11) {
+			mes "Eh!? Oh my! Oh no no no no! Your hair is sooo damaged! It's not good if you leave your hair like this.";
+			next;
+			mes "[Hairdresser Jovovich]";
+			mes "Would you let me treat your hair? Please?";
+		}
+		else mes "Wow! Your hair would be perfect once it's dyed~ How about dying your hair for a change?";
+	}
 	next;
-	menu "-Dye Hair.",M_0, "-Price List",M_1, "-Hair Tips",M_2, "-Cancel",M_End;
-
-	M_0:
-		mes "[HairDyer Jovovich]";
-		mes "Hohoho~ That's a good choice~~ Any time is a good time to change your hair color.";
-		next;
-		mes "[HairDyer Jovovich]";
-		mes "Please choose a color that suits you";
-		next;
-		menu	"-Red please.",sM_a, "-Yellow please.",sM_b,  "-Violet please.",sM_c, "-Orange please.",sM_d, "-Green please.",sM_e,
-			"-Blue please.",sM_f, "-White please.",sM_g, "-Black please.",sM_h, "-Sorry, I changed my mind.",M_End;
-
-		sM_a:
-			mes "[HairDyer Jovovich]";
-			if(countitem(975) < 1) goto sL_NoDye;
-			if(Zeny < 1000) goto sL_Zeny;
-			set Zeny, Zeny - 1000;
-			delitem 975,1;
-			mes "Ok. I will dye you hair red.";
-			setlook 6,8;
-
+	while(1) {
+		switch(select("Dye Hair:Tips and Information:Cancel")) {
+		case 1:
+			mes "[Hairdresser Jovovich]";
+			mes "Yes yes, good choice~";
+			mes "Well then, this is your chance for a make-over, your chance to blossom in beauty! Choose the color you would like.";
+			next;
+			while(1) {
+				if (.@choose_success == 1) {
+					mes "[Hairdresser Jovovich]";
+					mes "What do you think? Did you want a different color?";
+					next;
+					if (select("Yes:No") == 1) {
+						mes "[Hairdresser Jovovich]";
+						mes "Okay! Choose the color that you would like.";
+						next;
+					}
+					else  {
+						mes "[Hairdresser Jovovich]";
+						mes "Hmm, I'm sort of disappointed. I wanted to do a better job. But I promise I'll do it better next time. Please come again~";
+						close;
+					}
+				}
+
+				while(1) {
+					switch(select("Red, please.:Yellow, please.:Violet, please.:Orange, please.:Green, please.:Blue, please.:White, please.:Black, please.:Actually, I like my hair as it is.")) {
+					case 1: set .@headpalette,8; break;
+					case 2: set .@headpalette,1; break;
+					case 3: set .@headpalette,2; break;
+					case 4: set .@headpalette,3; break;
+					case 5: set .@headpalette,4; break;
+					case 6: set .@headpalette,5; break;
+					case 7: set .@headpalette,6; break;
+					case 8: set .@headpalette,7; break;
+					case 9:
+						if (.@choose_success != 0) {
+							mes "[Hairdresser Jovovich]";
+							mes "You must like your hair color~";
+							close;
+						}
+						mes "[Hairdresser Jovovich]";
+						mes "Eehh~? You're not going to dye your hair? I'm a little sad...";
+						close;
+					}
+
+					if (.@headpalette == getlook(7)) {
+						mes "[Hairdresser Jovovich]";
+						mes "Eh? But that's the hair color you already have. Please choose a different color.";
+						next;
+					}
+					else {
+						switch(.@headpalette) {
+						case 1: callsub S_NoDye,976,"yellow";
+						case 2: callsub S_NoDye,978,"violet";
+						case 3: callsub S_NoDye,979,"orange";
+						case 4: callsub S_NoDye,980,"green";
+						case 5: callsub S_NoDye,981,"blue";
+						case 6: callsub S_NoDye,982,"white"; 
+						case 7: callsub S_NoDye,983,"black";
+						Case 8: callsub S_NoDye,975,"red";
+						}
+						if (zeny < 1000) {
+							mes "[Hairdresser Jovovich]";
+							mes "The fee is 1000 zeny. Do you not have enough...?";
+							close;
+						}
+
+						switch(.@headpalette) {
+						case 1: delitem 976,1; //Lemon_Dyestuffs
+						case 2: delitem 978,1; //Violet_Dyestuffs
+						case 3: delitem 979,1; //Orange_Dyestuffs
+						case 4: delitem 980,1; //Darkgreen_Dyestuffs
+						case 5: delitem 981,1; //Cobaltblue_Dyestuffs
+						case 6: delitem 982,1; //White_Dyestuffs
+						case 7: delitem 983,1; //Black_Dyestuffs
+						case 8: delitem 975,1; //Scarlet_Dyestuffs
+						}
+						set Zeny,Zeny-1000;
+						setlook 6,.@headpalette;
+						set .@choose_success,1;
+						break;
+					}
+
+				}
+
+			}
+
+		case 2:
+			mes "[Hairdresser Jovovich]";
+			mes "When you're feeling down , when you get dumped, when you want to impress someone, or even when you just want to stand out...";
+			next;
+			mes "[Hairdresser Jovovich]";
+			mes "For that special place and time, wouldn't you want a hairstyle of your very own? As long as you have the appropriate dyestuff, I will make your hair look wonderful.";
+			next;
+			mes "[Hairdresser Jovovich]";
+			mes "And try not to worry too much about the fee. Acquiring beauty is the same as acquiring everything. Hehe~";
+			next;
+			mes "[Hairdresser Jovovich]";
+			mes "* Fees and Information *";
+			mes "- 1 Dyestuff item of the color of hair you want.";
+			mes "- 1000 zeny fee.";
+			break;
+
+		case 3:
+			mes "[Hairdresser Jovovich]";
+			mes "Men or Women...";
+			mes "Everyone has the right and obligation to be beautiful.";
 			close;
+		}
 
-		sM_b:
-			mes "[HairDyer Jovovich]";
-			if(countitem(976) < 1) goto sL_NoDye;
-			if(Zeny < 1000) goto sL_Zeny;
-			mes "Ok. I will dye you hair yellow.";
-			setlook 6,1;
-			delitem 976,1;
-			set Zeny, Zeny - 1000;
-			close;
-
-		sM_c:
-			mes "[HairDyer Jovovich]";
-			if(countitem(981) < 1) goto  sL_NoDye;
-			if(Zeny < 1000) goto sL_Zeny;
-			mes "Ok. I will dye you hair Violet.";
-			setlook 6,2;
-			delitem 981,1;
-			set Zeny, Zeny - 1000;
-			close;
-
-		sM_d:
-			mes "[HairDyer Jovovich]";
-			if(countitem(980) < 1) goto sL_NoDye;
-			if(Zeny < 1000) goto sL_Zeny;
-			mes "Ok. I will dye you hair Orange.";
-			setlook 6,3;
-			delitem 980,1;
-			set Zeny, Zeny - 1000;
-			close;
-
-		sM_e:
-			mes "[HairDyer Jovovich]";
-			if(countitem(979) < 1) goto sL_NoDye;
-			if(Zeny < 1000) goto sL_Zeny;
-			mes "Ok. I will dye you hair Green.";
-			setlook 6,4;
-			delitem 979,1;
-			set Zeny, Zeny - 1000;
-			close;
-
-		sM_f:
-			mes "[HairDyer Jovovich]";
-			if(countitem(978) < 1) goto sL_NoDye;
-			if(Zeny < 1000) goto sL_Zeny;
-			mes "Ok. I will dye you hair blue.";
-			setlook 6,5;
-			delitem 978,1;
-			set Zeny, Zeny - 1000;
-			close;
-
-		sM_g:
-			mes "[HairDyer Jovovich]";
-			if(countitem(982) < 1) goto sL_NoDye;
-			if(Zeny < 1000) goto sL_Zeny;
-			mes "Ok. I will dye you hair white.";
-			setlook 6,6;
-			delitem 982,1;
-			set Zeny, Zeny - 1000;
-			close;
-
-		sM_h:
-			mes "[HairDyer Jovovich]";
-			if(countitem(983) < 1) goto sL_NoDye;
-			if(Zeny < 1000) goto sL_Zeny;
-			mes "Ok. I will dye you hair black.";
-			setlook 6,7;
-			delitem 983,1;
-			set Zeny, Zeny - 1000;
-			close;
-
-		sL_NoDye:
-			mes "For me to dye your hair, I'll need the appropriate Dyestuff.  Please check my price list for the information.";
-			close;
-
-		sL_Zeny:
-			mes "I'm sorry but you don't have enough money.";
-			close;
-
-	M_1:
-		mes "[HairDyer Jovovich]";
-		mes "Here is the list of colors you can choose from and their prices:";
-		mes " - Red: 1000 zeny, 1 Scarlet Dyestuff";
-		mes " - Yellow: 1000 zeny, 1 Lemon Dyestuff";
-		mes " - Violet: 1000 zeny, 1 Violet Dyestuff";
-		mes " - Orange: 1000 zeny, 1 Orange Dyestuff";
-		mes " - Green: 1000 zeny, 1 DarkGreen Dyestuff";
-		mes " - Blue: 1000 zeny, 1 CobaltBlue Dyestuff";
-		mes " - White: 1000 zeny, 1 White Dyestuff";
-		mes " - Black: 1000 zeny, 1 Black Dyestuff";
-		goto qMenu0;
-
-	M_2:
-		mes "[HairDyer Jovovich]";
-		mes "When your just feeling gloomy, of if you just got dumped... if you want to look hot, or when you just need to look better.....";
-		next;
-		mes "[HairDyer Jovovich]";
-		mes "Change the color of your hair and your bound to regain your confidence and add an extra bounce to your step!!";
-		next;
-		mes "[HairDyer Jovovich]";
-		mes "For the small price of 1000 zeny and a Dyestuff, I can give you the haircolor you've been dreaming of!";
-		next;
-		goto qMenu0;
+	}
 
-	M_End:
-		mes "[HairDyer Jovovich]";
-		mes "I think... every human being has the right to become beautiful......";
+S_NoDye:
+	if (countitem(getarg(0)) == 0) {
+		mes "[Hairdresser Jovovich]";
+		mes "Eh?! But you need the item '"+getitemname(getarg(0))+"' to dye your hair "+getarg(1)+"...";
 		close;
-}
+	}
+}
\ No newline at end of file
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index dafee7de8..b2e645f5c 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 2.0
+//= 2.0b
 //===== Compatible With: ===================================== 
 //= eAthena 1.0+
 //===== Description: ========================================= 
@@ -31,6 +31,7 @@
 //=	Moved all Cooking related NPCs to their own section.
 //=	Re-alphabetized sections. Some of them were out of place.
 //=	Removed commented out shops.
+//= 2.0b Einbech tool dealer got lost somewhere along the way, re-added. [L0ne_W0lf]
 //============================================================ 
 
 //=======================================================
@@ -86,6 +87,7 @@ cmd_fild07,277,85,4	shop	Armor Dealer	101,2226:-1,2228:-1,2103:-1,2105:-1,2405:-
 ein_in01,106,27,4	shop	One Hand Weapon Dealer	850,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1119:-1,1122:-1,1123:-1,1126:-1,1129:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1301:-1,1401:-1,1404:-1,1407:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1516:-1,1519:-1,1522:-1,1801:-1,1803:-1,1805:-1,1807:-1,1809:-1,1811:-1
 ein_in01,109,27,4	shop	Two Hand Weapon Dealer	850,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1351:-1,1354:-1,1357:-1,1360:-1,1410:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1250:-1,1252:-1,1254:-1
 ein_in01,119,26,4	shop	Weapon Dealer	855,1247:-1,1248:-1,1249:-1,13000:-1
+ein_in01,189,15,1	shop	Tool Dealer	850,1750:-1,1753:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
 einbroch,138,66,4	shop	Flu Mask Dealer#ein	850,5114:-1,2218:-1
 einbroch,82,199,4	shop	Paddler#ein	855,512:-1,645:-1,1750:-1,501:-1
 //Official Gunslingers shops.