Rewrote barber NPC for new hairstyles and colors.

2 files changed, 58 insertions, 32 deletions

diff --git a/changelog.txt b/changelog.txt
index dedc0e48..122388dc 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -67,4 +67,6 @@
 17.12.07: * b_lindeijer: Ishi now gives cotton pants instead of Xmas hat.
 
 19.12.07: * Crush: Fixed a map bug (monster trap) on map 18 (woodland
-	    village surrounding)
\ No newline at end of file
+	    village surrounding)
+
+22.12.07: * Crush: Rewrote barber NPC for new hairstyles and colors.
\ No newline at end of file
diff --git a/npc/tulimshar/barber.txt b/npc/tulimshar/barber.txt
index 905da5e5..eea7f175 100644
--- a/npc/tulimshar/barber.txt
+++ b/npc/tulimshar/barber.txt
@@ -9,14 +9,33 @@ new_3-1.gat,102,31,0	script	Nicolas	100,{
 	"Nah I'm fine",fine;
 
 style:
+	if (Sex == 0) goto style_female;
+	
+style_male:
 	menu
-	"Classic",style1,
-	"Curly",style2,
-	"Scruffy",style3,
-	"Slick",style4,
-	"Mohawk",style5,
-	"Uncombed",style6;
+	"bald",style0,
+	"ponytail",style1,
+	"bowl cut",style2,
+	"combed back",style3,
+	"emo",style4,
+	"mohawk",style5,
+	"pompadour",style6,
+	"center parting",style7;
 
+style_female:
+	menu
+	"bald",style0,
+	"long and slick",style1,
+	"short and curly",style2,
+	"ponytail",style3,
+	"pigtails",style4,
+	"long and curly",style5,
+	"parted",style6,
+	"short and slick",style7;
+
+style0:
+	setlook 1,0;
+	close;
 style1:
 	setlook 1,1;
 	close;
@@ -35,55 +54,60 @@ style5:
 style6:
         setlook 1,6;
 	close;
+style7:
+        setlook 1,7;
+	close;
+style8:
+        setlook 1,8;
+	close;
 
 color:
 	menu
-	"Orange",orange,
-	"Green",green,
-	"Red",red,
-	"Purple",purple,
-	"White",white,
-	"Blonde",blonde,
-	"Light blue",lightblue,
-	"Brown",brown,
-	"Blue",blue,
-	"Violet",violet,
-	"No hair",nohair;
+	"brunette",color0,
+	"green",color1,
+	"dark red",color2,
+	"light purple",color3,
+	"gray",color4,
+	"blonde",color5,
+	"teal",color6,
+	"light red",color7,
+	"blue",color8,
+	"dark purple",color9;
 
 fine:
 	close;
 
-orange:
+color0:
+	setlook 6,0;
+	close;
+color1:
 	setlook 6,1;
 	close;
-green:
+color2:
 	setlook 6,2;
 	close;
-red:
+color3:
 	setlook 6,3;
 	close;
-purple:
+color4:
 	setlook 6,4;
 	close;
-white:
+color5:
 	setlook 6,5;
 	close;
-blonde:
+color6:
 	setlook 6,6;
 	close;
-lightblue:
+color7:
 	setlook 6,7;
 	close;
-brown:
+color8:
 	setlook 6,8;
 	close;
-blue:
+color9:
 	setlook 6,9;
 	close;
-violet:
+color10:
 	setlook 6,10;
 	close;
-nohair:
-	setlook 6,11;
-	close;
-}
+}
\ No newline at end of file