diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-01-05 10:30:44 -0500 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-02-08 21:04:25 -0500 |
| commit | 401ff146cbd56e214007c1a298194fdef66d5a96 (patch) | |
| tree | 5f4164a08fd85327cbb03387e2b6593d0306dbc4 /world/map/npc/items | |
| parent | 1e3050b638726ea407d28f4b860fb2b5722b069b (diff) | |
| download | serverdata-401ff146cbd56e214007c1a298194fdef66d5a96.tar.gz serverdata-401ff146cbd56e214007c1a298194fdef66d5a96.tar.bz2 serverdata-401ff146cbd56e214007c1a298194fdef66d5a96.tar.xz serverdata-401ff146cbd56e214007c1a298194fdef66d5a96.zip | |
remove the cruft left behind, prepare for new races
Diffstat (limited to 'world/map/npc/items')
| -rw-r--r-- | world/map/npc/items/mirror.txt | 21 | ||||
| -rw-r--r-- | world/map/npc/items/scissors.txt | 6 | ||||
| -rw-r--r-- | world/map/npc/items/shock_sweet.txt | 2 |
3 files changed, 14 insertions, 15 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; } diff --git a/world/map/npc/items/scissors.txt b/world/map/npc/items/scissors.txt index 640cc1c5..fbf3b344 100644 --- a/world/map/npc/items/scissors.txt +++ b/world/map/npc/items/scissors.txt @@ -1,14 +1,14 @@ function|script|useScissors { + getitem "Scissors", 1; if (rand(3)) goto L_Change; message strcharinfo(0), "Whoops!"; heal -20 - rand(Hp >> 1), 0; - getitem "Scissors", 1; return; L_Change: - setlook LOOK_HAIR_STYLE, rand(20); - getitem "Scissors", 1; + callfunc "getHeadStyles"; + setlook LOOK_HAIR_STYLE, rand(1,getarraysize(@HairStyles$)); return; } diff --git a/world/map/npc/items/shock_sweet.txt b/world/map/npc/items/shock_sweet.txt index 4de758d1..ea5992c3 100644 --- a/world/map/npc/items/shock_sweet.txt +++ b/world/map/npc/items/shock_sweet.txt @@ -7,7 +7,7 @@ function|script|useShockSweet return; L_Change: - setlook LOOK_HAIR_COLOR, HC_WHITE; + setlook LOOK_HAIR_COLOR, (HC_WHITE - Class) + 1; message strcharinfo(0), "Gah! That was some strong stuff!"; sc_start sc_poison, 1, 20; misceffect 15, strcharinfo(0); |