summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2012-02-24 17:42:51 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2012-03-01 19:06:36 +0100
commitc32f84d9fd28033b38f69ae59fadb87c88fb8e8f (patch)
tree6114b063da3a3b6a59cbb509ed6166fa9921d67e /world
parent3913106c6fc7118f805f60b70b4d69124185d541 (diff)
downloadserverdata-c32f84d9fd28033b38f69ae59fadb87c88fb8e8f.tar.gz
serverdata-c32f84d9fd28033b38f69ae59fadb87c88fb8e8f.tar.bz2
serverdata-c32f84d9fd28033b38f69ae59fadb87c88fb8e8f.tar.xz
serverdata-c32f84d9fd28033b38f69ae59fadb87c88fb8e8f.zip
New hairstyle: Long and clipped
Diffstat (limited to 'world')
-rw-r--r--world/map/db/const.txt2
-rw-r--r--world/map/npc/functions/barber.txt4
2 files changed, 4 insertions, 2 deletions
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",