From c32f84d9fd28033b38f69ae59fadb87c88fb8e8f Mon Sep 17 00:00:00 2001
From: Jessica Tölke <jtoelke@mail.upb.de>
Date: Fri, 24 Feb 2012 17:42:51 +0100
Subject: New hairstyle: Long and clipped

---
 world/map/db/const.txt             | 2 ++
 world/map/npc/functions/barber.txt | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'world/map')

diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index 85a5d68c..bc7518c4 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -178,6 +178,7 @@ HS_Mane                 15
 HS_Bun                  16
 HS_ShoulderLengthFlick  17
 HS_Fizzy                18
+HS_LongAndClipped       19
 
 // Hair colors
 HC_LIGHT_BROWN  0
@@ -192,6 +193,7 @@ HC_LIGHT_BLUE   8
 HC_DARK_PURPLE  9
 HC_BLACK        10
 HC_PINK         11
+HC_BROWN        12
 HC_WHITE        127
 
 // Colors for dyed items
diff --git a/world/map/npc/functions/barber.txt b/world/map/npc/functions/barber.txt
index cfd60c0f..7d4bb62d 100644
--- a/world/map/npc/functions/barber.txt
+++ b/world/map/npc/functions/barber.txt
@@ -53,7 +53,7 @@ L_Style:
         "Bun", -,
         "Shoulder Length Flick", -,
         "Fizzy", -,
-        // "Last normal style (currently displayed as bald)", -,
+        "Long and Clipped", -,
         "Surprise me", L_RandomStyle,
         "Nah, I'm fine", L_Done;
 
@@ -119,7 +119,7 @@ function|script|OnInitBarber|{
         "Pompadour", "Center parting/Short and slick", "Long and slick",
         "Short and curly", "Pigtails", "Long and curly", "Parted",
         "Perky ponytail", "Wave", "Mane", "Bun", "Shoulder Length Flick",
-        "Fizzy", "Bald";
+        "Fizzy", "Long and Clipped";
     setarray $@HairColors$,
         "Brunette", "Green", "Dark red", "Light purple", "Gray", "Blonde",
         "Teal", "Light red", "Blue", "Dark purple", "Black", "Pink",
-- 
cgit v1.2.3-60-g2f50