summaryrefslogtreecommitdiff
path: root/world/map/npc/items/mirror.txt
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/items/mirror.txt')
-rw-r--r--world/map/npc/items/mirror.txt21
1 files changed, 10 insertions, 11 deletions
diff --git a/world/map/npc/items/mirror.txt b/world/map/npc/items/mirror.txt
index dcca9398..c5dc5525 100644
--- a/world/map/npc/items/mirror.txt
+++ b/world/map/npc/items/mirror.txt
@@ -1,20 +1,19 @@
function|script|useMirror
{
- callfunc "getHeadStyles";
- goto L_Rand;
+ callfunc "getHeadStyles";
+ goto L_Rand;
- L_Rand:
- set @style, rand(1,(getarraysize(@HairStyles$) -2));
- set @color, rand((15 * (Class - 1)),((getarraysize(@HairColors$) -2) + (15 * (Class - 1))));
- if((getlook(LOOK_HAIR_STYLE) == @style) || (getlook(LOOK_HAIR_COLOR) == @color))
- goto L_Rand;
- goto L_Proceed;
-
- L_Proceed:
+L_Rand:
+ set @mirror_rnd, @mirror_rnd + 1;
+ set @style, rand(1,getarraysize(@HairStyles$));
+ set @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)
- setlook LOOK_HAIR_STYLE, @style;
+ 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)
set @fixedMirror, 0;
+ set @mirror_rnd, 0;
return;
}