diff options
| author | Fate <fate-tmw@googlemail.com> | 2009-01-12 08:02:59 -0700 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2009-01-12 08:02:59 -0700 |
| commit | 03e7550003650cb5cf79eb0c8d470ce8bd24ae27 (patch) | |
| tree | 437785d13b545d6562ba3b00513b8eb5a89c8f15 /npc/functions | |
| parent | 647f4a35bf8831df4fe23754e824f4bdfb5dcf72 (diff) | |
| parent | 5db6cb7d6c09dbb091edbdf21a3e0e3feae3175a (diff) | |
| download | serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.tar.gz serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.tar.bz2 serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.tar.xz serverdata-03e7550003650cb5cf79eb0c8d470ce8bd24ae27.zip | |
Merge branch 'master' into magic
Conflicts:
db/item_db.txt
Diffstat (limited to 'npc/functions')
| -rw-r--r-- | npc/functions/barber.txt | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt index 0edaab73..57c3c598 100644 --- a/npc/functions/barber.txt +++ b/npc/functions/barber.txt @@ -6,10 +6,9 @@ function script Barber { "Change my color", L_Color, "Nah, I'm fine", L_Done; + goto L_Done; + L_Style: - if (Sex == 0) goto L_Style_Female; - -L_Style_Male: menu "Bald", -, "Ponytail", -, @@ -18,27 +17,18 @@ L_Style_Male: "Emo", -, "Mohawk", -, "Pompadour", -, - "Center parting", -, - "Supprise me", -, - "Nah, I'm fine", close; - goto L_Process_Style; - -L_Style_Female: - menu - "Bald", -, + "Center parting/Short and slick", -, "Long and slick", -, "Short and curly", -, - "Ponytail", -, - "Pigtails", -, "Long and curly", -, + "Pigtails", -, "Parted", -, - "Short and slick", -, "Supprise me", -, "Nah, I'm fine", L_Done; L_Process_Style: set @style, @menu - 1; - if (@style == 8) set @style, rand(8); + if (@style == 13) set @style, rand(13); setlook 1, @style; return; |