From 2e926d6f31db49b6e7f95fcac79523f6bcd1f421 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Thu, 10 Jun 2021 04:18:56 -0300
Subject: Fix some barber related stuff (follow up for Micksha's update in
 client data)

---
 npc/items/mirror.txt      | 5 ++---
 npc/items/scissors.txt    | 1 -
 npc/items/shock_sweet.txt | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'npc/items')

diff --git a/npc/items/mirror.txt b/npc/items/mirror.txt
index b29e7fec..db673011 100644
--- a/npc/items/mirror.txt
+++ b/npc/items/mirror.txt
@@ -1,11 +1,10 @@
 function	script	useMirror	{
-    callfunc "getHeadStyles";
     goto L_Rand;
 
 L_Rand:
     .@mirror_rnd = .@mirror_rnd + 1;
-    @style = rand(1,getarraysize($@hairstyle$)-1);
-    @color = rand(getarraysize($@haircolor$));
+    @style = rand2(1,getarraysize($@hairstyle$)-1);
+    @color = rand2(getarraysize($@haircolor$));
     if (((getlook(LOOK_HAIR_STYLE) == @style) ||
         (getlook(LOOK_HAIR_COLOR) == @color)) &&
         .@mirror_rnd < 15)
diff --git a/npc/items/scissors.txt b/npc/items/scissors.txt
index b21a36e8..95d07b8b 100644
--- a/npc/items/scissors.txt
+++ b/npc/items/scissors.txt
@@ -7,7 +7,6 @@ function	script	useScissors	{
     return;
 
 L_Change:
-    callfunc "getHeadStyles";
     setlook LOOK_HAIR_STYLE, rand(1,getarraysize($@hairstyle$)-1);
     return;
 }
diff --git a/npc/items/shock_sweet.txt b/npc/items/shock_sweet.txt
index f1f1df71..c35ce37f 100644
--- a/npc/items/shock_sweet.txt
+++ b/npc/items/shock_sweet.txt
@@ -6,7 +6,7 @@ function	script	useShockSweet	{
     return;
 
 L_Change:
-    setlook LOOK_HAIR_COLOR, (HC_WHITE - Class) + 1;
+    setlook LOOK_HAIR_COLOR, 122;
     message strcharinfo(0), "Gah! That was some strong stuff!";
     sc_start SC_POISON, 1, 20;
     misceffect 15, strcharinfo(0);
-- 
cgit v1.2.3-70-g09d2