Improved barber script which now allows change of style.

2 files changed, 50 insertions, 13 deletions

diff --git a/conf/map_athena.conf b/conf/map_athena.conf
index bbacbbd6..d5d1ef2c 100755
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -47,6 +47,7 @@ import: conf/import/map_conf.txt
 
 // Maps
 
+map: new_4-1.gat
 map: new_3-1.gat
 map: new_2-1.gat
 map: new_1-1.gat
diff --git a/npc/tulimshar/barber.txt b/npc/tulimshar/barber.txt
index cfa8e7c3..dfd2d45e 100644
--- a/npc/tulimshar/barber.txt
+++ b/npc/tulimshar/barber.txt
@@ -1,21 +1,57 @@
 new_3-1.gat,102,31,0	script	Barber	100,{
 	mes "[Barber]";
-	mes "I'm the greatest barber in the whole mana world!";
-	mes "What color do you like?";
+	mes "I'm the greatest barber in the whole mana world! Would you like a change of style or color?";
 	next;
 
 	menu
-	"black",black,
-	"purple",purple,
-	"green",green,
-	"blue",blue,
-	"red",red,
-	"blonde",blonde,
-	"light blue",lightblue,
-	"gray",gray,
-	"brown",brown,
-	"white",white,
-	"no hair",nohair;
+	"Change my style",style,
+	"Change my color",color,
+	"Nah I'm fine",fine;
+
+style:
+	menu
+	"Classic",style1,
+	"Curly",style2,
+	"Scruffy",style3,
+	"Slick",style4,
+	"Mohowk (needs CVS)",style5;
+
+style1:
+	setlook 1,1;
+	close;
+
+style2:
+	setlook 1,2;
+	close;
+
+style3:
+	setlook 1,3;
+	close;
+
+style4:
+	setlook 1,4;
+	close;
+
+style5:
+	setlook 1,5;
+	close;
+
+color:
+	menu
+	"Black",black,
+	"Purple",purple,
+	"Green",green,
+	"Blue",blue,
+	"Red",red,
+	"Blonde",blonde,
+	"Light blue",lightblue,
+	"Gray",gray,
+	"Brown",brown,
+	"White",white,
+	"No hair",nohair;
+
+fine:
+	close;
 
 black:
 	setlook 6,1;