diff options
author | mekolat <mekolat@users.noreply.github.com> | 2016-02-08 21:24:30 -0500 |
---|---|---|
committer | mekolat <mekolat@users.noreply.github.com> | 2016-02-08 21:24:30 -0500 |
commit | d9cd196c2f7b856c16a8b435cc3090436ec298d2 (patch) | |
tree | e66ed8c462c1a7358277787343e59a9ce5589e7f /world/map/npc/items/mirror.txt | |
parent | 062fb12c6386d2ac2c5e4f1dc8cf7596e11c82c1 (diff) | |
parent | ec011e27ec8459277563222d94c4cf981d752d11 (diff) | |
download | serverdata-d9cd196c2f7b856c16a8b435cc3090436ec298d2.tar.gz serverdata-d9cd196c2f7b856c16a8b435cc3090436ec298d2.tar.bz2 serverdata-d9cd196c2f7b856c16a8b435cc3090436ec298d2.tar.xz serverdata-d9cd196c2f7b856c16a8b435cc3090436ec298d2.zip |
Merge pull request #455 from mekolat/headstyle-genderv2016.2.9
3rd gender, new races
Diffstat (limited to 'world/map/npc/items/mirror.txt')
-rw-r--r-- | world/map/npc/items/mirror.txt | 21 |
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; } |