- 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

1 files changed, 160 insertions, 166 deletions

diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index 4f24dec2b..da36af092 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 2.3
+//= 2.4
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -30,6 +30,7 @@
 //= 2.1 Added missing close. [L0ne_W0lf]
 //= 2.2 Updated Gotan to be compliant with misc_quiest var. [L0ne_W0lf]
 //= 2.3 Updated heardgear Quest NPCs. [L0ne_W0lf]
+//= 2.4 Updated 'Doll Quest' to match AEGIS script. [Kisuka]
 //============================================================ 
 
 
@@ -38,48 +39,38 @@
 //						Doll Quest
 //=======================================================================================================//
 alberta,117,135,0	script	Elin	96,{
-	set .@weight,MaxWeight-Weight;
-	if ((.@weight) < 10000) {
+	if (checkweight(1201,1) == 0) {
 		mes "[Elin]";
-		mes "Wait a moment!!";
-		mes "You have brought too many things!";
-		mes "You cannot accept any more items!";
-		mes "Please reduce the amount of items,";
-		mes "then come see me again";
+		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
 		close;
 	}
 	mes "[Elin]";
 	if (Sex == 1) {
 		mes "Hello~!";
-		mes "Heh heh, you're a boy, so you";
-		mes "probably don't like dolls, right?";
-		mes "Well, I like dolls very very much!";
+		mes "Heh heh, you're a boy, so you probably don't like dolls, right? Well, I like dolls very very much!";
 	} else {
-		mes "Hi hi~! Oh, oh, do you like dolls?";
-		mes "I really really like dolls... Hee";
-		mes "Hee~!";
+		mes "Hi hi~! Oh, oh, do you like dolls? I really really like dolls... Hee Hee~!";
 	}
 	next;
 	mes "[Elin]";
-	mes "You know, I really really want a";
-	mes "new doll! I hope my daddy will give";
-	mes "me one on my birthday...!";
+	mes "You know, I really really want a new doll! I hope my daddy will give me one on my birthday...!";
+	next;
 	switch(select("Um, I hope your daddy gives you one too.","How about I give you one now?")) {
 		case 1:
-			next;
 			mes "[Elin]";
 			mes "Yeah, I'm hoping";
 			mes "he gives me a Yoyo";
 			mes "doll. They're so cute!";
 			close;
 		case 2:
-			next;
 			set .@weight,MaxWeight-Weight;
-			if ((.@weight) < 10000) {
+			if ((.@weight) < 1000) {
 				mes "[Elin]";
-				mes "Your weight is too heavy!";
-				mes "I will accept your doll if";
-				mes "you lighten your load.";
+				if (Sex == 1) {
+					mes "Maybe you should put some of your stuff away first, you look like you're carrying too much, hee hee~";
+				} else {
+					mes "Do you always carry so much with you? Put some of your things away first, okay?";
+				}
 				close;
 			}
 			mes "[Elin]";
@@ -94,20 +85,39 @@ alberta,117,135,0	script	Elin	96,{
 			}
 			next;
 			mes "[Elin]";
-			mes "What kind of doll are you going to";
-			mes "give me? Are you really gonna give";
-			mes "me one?";
-			switch(select("Poring Doll","Chonchon Doll","Puppet","Rocker Doll","Spore Doll","Osiris Doll","Baphomet Doll","Racoon Doll","YoYo Doll","I'm as adorable as a doll.")) {
+			mes "What kind of doll are you going to give me? Are you really gonna give me one?";
+			next;
+			switch(select("Poring Doll","Chonchon Doll","Puppet","Rocker Doll","Spore Doll","Osiris Doll","Baphomet Doll","Raccoon Doll","Yoyo Doll","I'm as adorable as a doll.")) {
 				case 1:
-					next;
 					if (countitem(741) >= 1) {
+						delitem 741,1;	// Poring_Doll
+						mes "[Elin]";
+						mes "Aww...";
+						mes "I have a lot";
+						mes "of Poring dolls...";
+						next;
+						mes "[Elin]";
+						if (Sex == 1) {
+							mes "But since a cute boy is giving it to me, I'll happily take it! Hee hee, soft and fluffy Poring doll~";	
+						} else {
+							mes "But since a nice girl is giving it to me, I'll take it! Hee he, soft and fluffy Poring doll~";
+						}
+						next;
 						mes "[Elin]";
-						mes "Yay, it's a poring doll!";
+						mes "Ooh, let me give you something as a little thank you. You see, I hid some candy so I can eat it without telling mommy.";
+						next;
+						getitem 529,1;	// Candy
+						mes "[Elin]";
+						if (Sex == 1) {
+							mes "I don't know if you're too old to like candy, but I guess it's okay.";
+						} else {
+							mes "So, try not to eat too much, okay? Otherwise, you might get in trouble!";
+						}
 						next;
-						delitem 741,1;
-						getitem 529,1;
 						mes "[Elin]";
-						mes "Thank you for the doll!";
+						mes "Thank you";
+						mes "so much for";
+						mes "the Poring doll!";
 						close;
 					} else {
 						mes "[Elin]";
@@ -116,8 +126,7 @@ alberta,117,135,0	script	Elin	96,{
 							mes "Were you only teasing me?";
 						} else {
 							mes "Aww...";
-							mes "You're not making fun of me are";
-							mes "you?";
+							mes "You're not making fun of me are you?";
 						}
 						next;
 						mes "[Elin]";
@@ -125,100 +134,87 @@ alberta,117,135,0	script	Elin	96,{
 						close;
 					}
 				case 2:
-					next;
 					if (countitem(742) >= 1) {
+						delitem 742,1;	// Chonchon_Doll
 						mes "[Elin]";
-						mes "Eh .... Chonchon ... doll ...";
-						next;
-						mes "[Elin]";
-						mes "Oh well, since you're giving it to me, I have to treasure it ....";
+						mes "Agh--!";
+						mes "A Ch-Ch, Chonchon doll?!";
 						next;
-						delitem 742,1;
-						getitem 530,1;
 						mes "[Elin]";
-						mes "If I ate too much of it, I'll get cavities anyway.";
 						if (Sex == 1) {
-							mes "You too, mister.";
+							mes "But since... You're... Such a nice guy... I better take it...!";
 						} else {
-							mes "You too, lady.";
+							mes "But since... Since it's a gift... I guess I'll take it...";
 						}
-						mes "Don't eat too much, ok?";
-						mes "And thanks, by the way ...";
 						next;
 						mes "[Elin]";
-						mes "(Chonchon ... *mumble mumble*)";
+						mes "Mmm~";
+						mes "Let me give you";
+						mes "something in return..."	;
+						next;
+						getitem 530,1;	// Candy_Striper
+						mes "[Elin]";
+						mes "If you eat too much, your teeth will start to rot... at least, that's what Mommy says.";
+						next;
+						mes "[Elin]";
+						mes "And..";
+						mes "Uh...";
+						mes "Thank you";
+						mes "for the doll?";
 						close;
 					} else {
 						mes "[Elin]";
-						mes "Chonchon dolls are ugly anyways,";
-						mes "but you still lied to me! How can";
-						mes "you be so mean?!";
+						mes "Chonchon dolls are ugly anyways, but you still lied to me! How can you be so mean?!";
 						next;
 						mes "[Elin]";
-						mes "Waaaaaaaaaaaaaaaaah~~";
+						mes "Waaaaaaaaah~~";
 						close;
 					}
 				case 3:
-					next;
 					if (countitem(740) >= 1) {
+						delitem 740,1;	// Stuffed_Doll
 						mes "[Elin]";
-						mes "Wow--! It's a rabbit!";
-						mes "It's so cute!!";
-						if (Sex == 1) {
-							mes "Thank you so much, mister!";
-						} else {
-							mes "Thank you so much, lady!";
-						}
+						mes "Wow...!";
+						mes "It looks like a bunny!";
 						next;
 						mes "[Elin]";
-						mes "So fluffy~";
-						mes "Oh yeah! Let me give you a present too!";
-						mes "Ummm ... found it!";
-						mes "Take this!";
+						mes "I really like this Puppet~ Heh hehe! Thank you so much~";
 						next;
-						delitem 740,1;
-						getitem 530,1;
 						mes "[Elin]";
-						mes "I got this from Santa. It's a candy cane~";
-						if (Sex == 1) {
-							mes "Eat it too, mister.";
-						} else {
-							mes "Eat it too, lady.";
-						}
-						mes "Thank you for the rabbit doll!";
-						mes "I'm gonna hug this to sleep every night~";
+						mes "Ooh ooh!";
+						mes "I have something";
+						mes "for you too!";
+						mes "Um, where";
+						mes "did it... Ah!";
+						next;
+						getitem 530,1;	// Candy_Striper
+						mes "[Elin]";
+						mes "Here it is! It's some of the candy Santa gave me. Go ahead and try some! Oh, and thank you so much for the doll!";
 						close;
 					} else {
 						mes "[Elin]";
-						mes "Awww, you were only kidding?";
-						mes "W-W-Why are you teasing me like";
-						mes "that?";
+						mes "Awww, you were only kidding? W-W-Why are you teasing me like that?";
 						next;
 						mes "[Elin]";
-						mes "*^CCCCCCSniff...^000000*";
+						mes "^666666*Sniff...*^000000";
 						next;
 						mes "[Elin]";
-						mes "Waaaaaaaaaaaaaaaaah~~";
+						mes "Waaaaaaaaah~~";
 						close;
 					}
 				case 4:
-					next;
 					if (countitem(752) >= 1) {
+						delitem 752,1;	// Grasshopper_Doll
 						mes "[Elin]";
-						mes "Ah, a Rocker doll.";
-						mes "I hate hopping things but the doll's kinda cute.";
+						mes "Ooh! Rocker Doll!";
+						mes "It's the Rocker that likes singing and dancing! I don't like grasshoppers, but I like this because it's cute~";
 						next;
 						mes "[Elin]";
-						mes "Thank you~";
-						mes "I'll have to give you something too.";
-						mes "Hmm, didn't I get some stuff from my uncle ...";
+						mes "Hmmm, I should give you something too, huh? Let's see, I have what my grandpa gave me...";
 						next;
-						delitem 752,1;
-						getitem 532,7;
+						getitem 532,7;	// Banana_Juice
 						mes "[Elin]";
-						mes "We've got tons of them at home.";
-						mes "So I'll share some with you~";
-						mes "Thank you for the doll!";
+						mes "Here you go! We have a lot of this at home, so I'll give it to you, okay? Oh, and thank you so much for the doll~ I love cute dolls!";
 						close;
 					} else {
 						mes "[Elin]";
@@ -231,30 +227,25 @@ alberta,117,135,0	script	Elin	96,{
 						close;
 					}
 				case 5:
-					next;
 					if (countitem(743) >= 1) {
+						delitem 743,1;	// Spore_Doll
 						mes "[Elin]";
-						mes "Blehh ....";
-						mes "It's a mushroom...";
-						mes "Mom's always scolding me for not eating mushrooms ...";
+						mes "It's a mushroom?";
+						mes "Ewwwwwwwww, yucky!";
+						mes "Mommy made me eat";
+						mes "mushrooms today, too...";
 						next;
 						mes "[Elin]";
-						mes "I'll take it anyway, since the doll looks cute.";
-						mes "But I still won't eat mushrooms though ...";
-						mes "Hmm, I'll need to give you a present too.";
+						mes "But this doll is cute, so I'll take it. But I'm still not gonna eat mushrooms! Heh heh~";
 						next;
-						delitem 743,1;
-						getitem 538,5;
+						getitem 538,5;	// Well_Baked_Cookie
 						mes "[Elin]";
-						mes "Mom made this.";
-						if (Sex == 1) {
-							mes "Take it, mister!";
-						} else {
-							mes "Take it, lady!";
-						}
+						mes "Hehe~ My mommy made this! It's really yummy. I love cookies, too. So try it, you'll like it! Hee hee!";
 						next;
-						mes "[Litte Kid]";
-						mes "Thank you for the doll~";
+						mes "[Elin]";
+						mes "Thanks for";
+						mes "the doll! I'll";
+						mes "take good care of it!";
 						close;
 					} else {
 						mes "[Elin]";
@@ -266,19 +257,31 @@ alberta,117,135,0	script	Elin	96,{
 						mes "Awww...";
 						mes "It's not nice";
 						mes "to tease people";
-						mes "like that. *^CCCCCCSniff, sniff^000000*";
+						mes "like that. ^666666*Sniff, sniff*^000000";
 						close;
 					}
 				case 6:
-					next;
 					if (countitem(751) >= 1) {
+						delitem 751,1;	// Osiris_Doll
+						mes "[Elin]";
+						mes "Ahhhhh!";
+						mes "What is this";
+						mes "thing?! It's so scary!";
+						next;
+						mes "[Elin]";
+						mes "I've never seen a doll like this before. Where it's from? Hmm? Since I've never seen this kind of doll before, I'm gonna show it to my daddy, too. Hehe~! He'll be surprised!";
+						next;
 						mes "[Elin]";
-						mes "Yay! It's an Osiris doll!";
+						mes "Here, since you gave me such a nicely made doll, I better give you something good too.";
 						next;
-						delitem 751,1;
-						getitem 522,2;
+						getitem 522,2;	// Fruit_Of_Mastela
 						mes "[Elin]";
-						mes "Thank you for the doll!";
+						mes "I found it when I secretly went to the forest. I took it because it has pretty colors!";
+						if (Sex == 1) {
+							mes "Since there's two, you can share it with your girlfriend. Hee hee~!";
+						} else {
+							mes "Since there's two, you can share it with your boyfriend. Hee hee~!";
+						}
 						close;
 					} else {
 						mes "[Elin]";
@@ -288,90 +291,82 @@ alberta,117,135,0	script	Elin	96,{
 						close;
 					}
 				case 7:
-					next;
 					if (countitem(750) >= 1) {
+						delitem 750,1;	// Baphomet_Doll
+						mes "[Elin]";
+						mes "Huh?";
+						mes "It's a little goat...";
+						next;
+						mes "[Elin]";
+						mes "It's so weird. It's cute but it's also scary at the same time. Well, since you gave me a pretty doll, I wanna give you something, too.";
+						next;
+						getitem 525,5;	// Panacea
 						mes "[Elin]";
-						mes "Yay! It's a Baphomet doll!";
+						mes "My daddy gave me this when I was really sick. I'm not sick anymore so you can use it when you need to. Hehehe~";
 						next;
-						delitem 750,1;
-						getitem 525,5;
 						mes "[Elin]";
-						mes "Thank you for the doll!";
+						mes "Hee hee~";
+						mes "Thank you for";
+						mes "the doll. I won't lose it!";
 						close;
 					} else {
 						mes "[Elin]";
-						mes "You big liar! Why are you";
-						mes "pretending to be nice?!";
+						mes "You big liar! Why are you pretending to be nice?!";
 						close;
 					}
 				case 8:
-					next;
 					if (countitem(754) >= 1) {
+						delitem 754,1;	// Raccoondog_Doll
 						mes "[Elin]";
-						mes "Ah, it's a racoon doll~";
-						mes "I hate Smokies, but the doll's really cute!";
+						mes "Hehe, it's a";
+						mes "raccoon doll.";
+						mes "It's very very cute~";
 						next;
 						mes "[Elin]";
-						mes "It's really cute~";
-						if (Sex == 1) {
-							mes "Thank you very much, mister!";
-						} else {
-							mes "Thank you very much, lady!";
-						}
+						mes "I don't like";
+						mes "Smokies in real life,";
+						mes "but this doll is nice!";
 						next;
-						delitem 754,1;
-						getitem 539,3;
+						getitem 539,3;	// Piece_Of_Cake
 						mes "[Elin]";
-						mes "Let me give you some of Grandma's home-made cakes!";
-						if (Sex == 1) {
-							mes "Do you like sweet things, mister?";
-						} else {
-							mes "Do you like sweet things, lady?";
-						}
-						mes "This is really good, so eat it~";
+						mes "Here, let me give you some cake my grandma made. It's really yummy. I don't know if you like sweets or not, but it's really good! Please try some!";
 						next;
 						mes "[Elin]";
-						mes "Thank you for this cute doll!";
+						mes "Hee hee~";
+						mes "Thanks for the doll.";
+						mes "I'm gonna keep it";
+						mes "in my room!";
 						close;
 					} else {
 						mes "[Elin]";
-						mes "Hey! How come you have to say";
-						mes "things like that? Are you making";
-						mes "fun of me?!";
+						mes "Hey! How come you have to say things like that? Are you making fun of me?!";
 						close;
 					}
 				case 9:
-					next;
 					if (countitem(753) >= 1) {
+						delitem 753,1;	// Monkey_Doll
 						mes "[Elin]";
-						mes "Wow--!!!";
-						mes "It's a monkey! So cute~";
-						if (Sex == 1) {
-							mes "Thank you very much, mister!";
-						} else {
-							mes "Thank you very much, lady!";
-						}
-						mes "I really wanted it~";
+						mes "Woooooooow~!";
 						next;
 						mes "[Elin]";
-						mes "It's so cute~";
-						mes "That's right!";
-						mes "As a thank you, I'll give you this.";
+						mes "A Yoyo doll! It's so pretty! You're really gonna give it to me?! Yay! Thank you so much! I really like it! Hee hee!";
 						next;
-						delitem 753,1;
-						getitem 608,1;
 						mes "[Elin]";
-						mes "Dad picked them up during his travels.";
-						mes "It's a seed of some kind.";
-						mes "We tried planting them at home, but it doesn't seem to grow.";
-						if (Sex == 1) {
-							mes "I'll give it to you, mister!";
-						} else {
-							mes "I'll give it to you, lady!";
-						}
+						mes "Since you gave";
+						mes "me such a pretty doll,";
+						mes "I wanna give you";
+						mes "something, too!";
+						next;
+						getitem 608,1;	// Seed_Of_Yggdrasil
+						mes "[Elin]";
+						mes "My daddy picked it up on his way to another town. It looks like some kind of seed. I tried planting it in front of our house but it won't grow. Do you want to try?";
 						next;
 						mes "[Elin]";
-						mes "Thank you so much for the doll!";
+						mes "Hehe~";
+						mes "Thanks for";
+						mes "the doll. I'll hug";
+						mes "it before I go";
+						mes "to sleep!";
 						close;
 					} else {
 						mes "[Elin]";
@@ -380,12 +375,11 @@ alberta,117,135,0	script	Elin	96,{
 						close;
 					}
 				case 10:
-					next;
 					mes "["+strcharinfo(0)+"]";
 					mes "I'm as adorable as a doll...";
 					next;
 					mes "[Elin]";
-					mes "Whaaaaaaaaaaaaaaaaaaaaat...?";
+					mes "Whaaaaaaaaaaat...?";
 					next;
 					mes "[Elin]";
 					mes "^3355FFWhat did^000000";