summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-07-29 14:06:20 -0300
committerJesusaves <cpntb1@ymail.com>2021-07-29 14:06:20 -0300
commitaf29a8343fa0421fd5ed6077621bf31a21471d70 (patch)
tree0b75795183fbe7c29bb1cbdda16bd1a15d19ee1e
parentb0364c3f77f0cd86a198868b8e992e585a055e91 (diff)
downloadserverdata-af29a8343fa0421fd5ed6077621bf31a21471d70.tar.gz
serverdata-af29a8343fa0421fd5ed6077621bf31a21471d70.tar.bz2
serverdata-af29a8343fa0421fd5ed6077621bf31a21471d70.tar.xz
serverdata-af29a8343fa0421fd5ed6077621bf31a21471d70.zip
Update barber and pickled beets
-rw-r--r--npc/functions/barber.txt5
-rw-r--r--npc/functions/headstyles.txt6
-rw-r--r--npc/items/pickled_beets.txt6
3 files changed, 7 insertions, 10 deletions
diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt
index ee1687dc..1cded281 100644
--- a/npc/functions/barber.txt
+++ b/npc/functions/barber.txt
@@ -41,7 +41,7 @@ function script BarberChangeStyle {
for (.@i = 1; .@i < .@hairsizearray; .@i++)
{
.@menustr$ = .@menustr$
- + rif(.@get_look != .@i, l("" + $@hairstyle$[.@i] + ""))
+ + rif(.@get_look != .@i, l("" + $@hairstyle$[.@i] + ""))
+ ":";
}
@@ -82,7 +82,8 @@ function script BarberChangeColor {
for (.@i = 0; .@i < .@hairsizearray; .@i++)
{
.@menustr$ = .@menustr$
- + rif(.@get_look != .@i, l("" + $@haircolor$[.@i] + ""))
+ + rif(.@get_look != .@i && .@i != HC_PURPLE,
+ l("" + $@haircolor$[.@i] + ""))
+ ":";
}
diff --git a/npc/functions/headstyles.txt b/npc/functions/headstyles.txt
index c0aeee60..93ffdbc2 100644
--- a/npc/functions/headstyles.txt
+++ b/npc/functions/headstyles.txt
@@ -12,9 +12,9 @@ OnInit:
"Long Ponytail", "Indefinitely long";
setarray $@haircolor$[0], "Light Brown", "Green", "Red",
- "Purple", "Gray", "Yellow", "Blue",
- "Light Red", "Light Blue", "Dark Purple", "Black",
- "Pink", "Brown", "Dark";
+ "Purple", "Gray", "Yellow", "Blue", "Brown",
+ "Light Blue", "Dark Purple", "Black",
+ "Pink", "Dark", "Light Red";
setarray $@REFEXP[0], 400, 900, 2250, 6500, 15000;
end;
diff --git a/npc/items/pickled_beets.txt b/npc/items/pickled_beets.txt
index a1a418c6..998ccdf7 100644
--- a/npc/items/pickled_beets.txt
+++ b/npc/items/pickled_beets.txt
@@ -1,9 +1,5 @@
function script usePickledBeets {
heal 50, 0;
- if (Class == 1)
- setlook LOOK_HAIR_COLOR, HC_PURPLE;
- else if (Class == 2)
- setlook LOOK_HAIR_COLOR, 18;
- // add more here for races that have purple
+ setlook LOOK_HAIR_COLOR, HC_PURPLE;
return;
}