* 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

1 files changed, 134 insertions, 140 deletions

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