diff options
author | Jesusaves <cpntb1@ymail.com> | 2021-05-01 14:17:33 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2021-05-01 14:17:33 -0300 |
commit | 69eb06640606e950bfe0d60b1be980aebca74e91 (patch) | |
tree | 0d2195ab68f53fd578023ca47d6f321f87b42264 /npc/items | |
parent | 8475167670c2e58a8448184c9abbf21e2174d557 (diff) | |
download | serverdata-69eb06640606e950bfe0d60b1be980aebca74e91.tar.gz serverdata-69eb06640606e950bfe0d60b1be980aebca74e91.tar.bz2 serverdata-69eb06640606e950bfe0d60b1be980aebca74e91.tar.xz serverdata-69eb06640606e950bfe0d60b1be980aebca74e91.zip |
Fix some hairy issues ;-)
Diffstat (limited to 'npc/items')
-rw-r--r-- | npc/items/mirror.txt | 15 | ||||
-rw-r--r-- | npc/items/scissors.txt | 4 |
2 files changed, 10 insertions, 9 deletions
diff --git a/npc/items/mirror.txt b/npc/items/mirror.txt index 9e114c36..b29e7fec 100644 --- a/npc/items/mirror.txt +++ b/npc/items/mirror.txt @@ -3,16 +3,17 @@ function script useMirror { goto L_Rand; L_Rand: - @mirror_rnd = @mirror_rnd + 1; - @style = rand(1,getarraysize(@HairStyles$)); - @color = rand((15 * (Class - 1)),((15 * (Class - 1)) + (getarraysize(@HairColors$) - 1))); - if(((getlook(LOOK_HAIR_STYLE) == @style) || (getlook(LOOK_HAIR_COLOR) == @color)) && @mirror_rnd < 15) - goto L_Rand; - if(@fixedMirror) + .@mirror_rnd = .@mirror_rnd + 1; + @style = rand(1,getarraysize($@hairstyle$)-1); + @color = rand(getarraysize($@haircolor$)); + if (((getlook(LOOK_HAIR_STYLE) == @style) || + (getlook(LOOK_HAIR_COLOR) == @color)) && + .@mirror_rnd < 15) + goto L_Rand; + if (@fixedMirror) setlook LOOK_HAIR_STYLE, @style; setlook LOOK_HAIR_COLOR, @color; //if(!@fixedMirror) getitem "SilverMirror", 1; <== this can be used in the future to have a portable hair color changer (like scissors but for the color) @fixedMirror = 0; - @mirror_rnd = 0; return; } diff --git a/npc/items/scissors.txt b/npc/items/scissors.txt index d27e8f6f..b21a36e8 100644 --- a/npc/items/scissors.txt +++ b/npc/items/scissors.txt @@ -3,11 +3,11 @@ function script useScissors { if (rand(3)) goto L_Change; message strcharinfo(0), "Whoops!"; - heal -20 - rand(Hp >> 1), 0; + heal -20 - rand(Hp >> 1), 0; // ??? return; L_Change: callfunc "getHeadStyles"; - setlook LOOK_HAIR_STYLE, rand(1,getarraysize(@HairStyles$)); + setlook LOOK_HAIR_STYLE, rand(1,getarraysize($@hairstyle$)-1); return; } |