summaryrefslogtreecommitdiff
path: root/npc/items
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-06-10 04:18:56 -0300
committerJesusaves <cpntb1@ymail.com>2021-06-10 04:18:56 -0300
commit2e926d6f31db49b6e7f95fcac79523f6bcd1f421 (patch)
tree8a35e611ea50ad064525b66ae0c8700a38ab4a60 /npc/items
parent2575f51fa881e4258e797d2a5b19aeefaa5c2bff (diff)
downloadserverdata-2e926d6f31db49b6e7f95fcac79523f6bcd1f421.tar.gz
serverdata-2e926d6f31db49b6e7f95fcac79523f6bcd1f421.tar.bz2
serverdata-2e926d6f31db49b6e7f95fcac79523f6bcd1f421.tar.xz
serverdata-2e926d6f31db49b6e7f95fcac79523f6bcd1f421.zip
Fix some barber related stuff (follow up for Micksha's update in client data)
Diffstat (limited to 'npc/items')
-rw-r--r--npc/items/mirror.txt5
-rw-r--r--npc/items/scissors.txt1
-rw-r--r--npc/items/shock_sweet.txt2
3 files changed, 3 insertions, 5 deletions
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);