summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormekolat <mekolat@gmail.com>2014-10-23 13:00:45 -0400
committermekolat <mekolat@gmail.com>2014-10-23 13:00:45 -0400
commite343e7fc35a14c453aa0cb218b97a66077573bed (patch)
treed06d1f3fe1eec00490e2d1a0f640df531ce06628
parentfc48c7a7ee9f99b381da0aec023eaa45f42fdcbf (diff)
downloadserverdata-e343e7fc35a14c453aa0cb218b97a66077573bed.tar.gz
serverdata-e343e7fc35a14c453aa0cb218b97a66077573bed.tar.bz2
serverdata-e343e7fc35a14c453aa0cb218b97a66077573bed.tar.xz
serverdata-e343e7fc35a14c453aa0cb218b97a66077573bed.zip
fixup
-rw-r--r--world/map/npc/functions/barber.txt35
-rw-r--r--world/map/npc/items/mirror.txt2
2 files changed, 19 insertions, 18 deletions
diff --git a/world/map/npc/functions/barber.txt b/world/map/npc/functions/barber.txt
index 46b423ce..0f9b4ffb 100644
--- a/world/map/npc/functions/barber.txt
+++ b/world/map/npc/functions/barber.txt
@@ -11,10 +11,12 @@
function|script|Barber|,
{
- callfunc "getHeadStyles";
+ callfunc "getHeadStyles";
+ goto L_Main;
+
+L_Main:
set @style, getlook(LOOK_HAIR_STYLE);
set @color, getlook(LOOK_HAIR_COLOR);
-
set @style$, "Unknown";
set @color$, "Unknown";
if (@style >= 0 && @style < 20)
@@ -23,13 +25,9 @@ function|script|Barber|,
set @color$, @HairColors$[@color];
if (@color == 127)
set @color$, "Shocked White";
-
mes "Your current style is " + @style$ + " and your current color is " + @color$ + ".";
set @style$, "";
set @color$, "";
- goto L_Main;
-
-L_Main:
menu
"Change my style", L_Style,
"Change my color", L_Color,
@@ -72,24 +70,24 @@ L_MenuItems:
goto L_SameStyle;
if(@menu == (getarraysize(@HairStyles$) - 1)) goto L_RandomStyle;
if(@menu == getarraysize(@HairStyles$)) goto L_Done;
- if(@menu == 1)
- set @menu, 21; // bald headstyle
setlook LOOK_HAIR_STYLE, @menu - 1;
- goto L_Done;
+ goto L_Main;
L_RandomStyle:
set @randomStyle, rand(0, (getarraysize(@HairStyles$) -4));
- if(@randomStyle == 0)
- set @randomStyle, 20;
+ if(@randomStyle == @style) goto L_RandomStyle;
setlook LOOK_HAIR_STYLE, @randomStyle;
- goto L_Done;
+ menu
+ "Surprise me once again", L_RandomStyle,
+ "Go back", L_Main,
+ "Goodbye", L_Done;
L_SameStyle:
mes "Your hair already has that style.";
goto L_Main;
L_Color:
- if(@style == 20) goto L_SameColor;
+ if(@style == Class) goto L_SameColor; // first headstyle of any class is bald
if(!@colorOpts) set @HairColors$[getarraysize(@HairColors$)], "Surprise me";
if(!@colorOpts) set @HairColors$[getarraysize(@HairColors$)], "Nah, I'm fine";
if(!@colorOpts) set @colorOpts, 1;
@@ -118,11 +116,16 @@ L_MenuItems1:
if(@menu == (getarraysize(@HairColors$) - 1)) goto L_RandomColor;
if(@menu == getarraysize(@HairColors$)) goto L_Done;
setlook LOOK_HAIR_COLOR, ((@menu - 1) + (15 * Class));
- goto L_Done;
+ goto L_Main;
L_RandomColor:
- setlook LOOK_HAIR_COLOR, rand((15 * Class), ((getarraysize(@HairColors$) -4) + (15 * Class)));
- goto L_Done;
+ set @randomColor, rand((15 * Class), ((getarraysize(@HairColors$) -4) + (15 * Class)));
+ if(@randomColor == @color) goto L_RandomColor;
+ setlook LOOK_HAIR_COLOR, @randomColor;
+ menu
+ "Surprise me once again", L_RandomColor,
+ "Go back", L_Main,
+ "Goodbye", L_Done;
L_SameColor:
mes "You are either bald or your hair is already that color.";
diff --git a/world/map/npc/items/mirror.txt b/world/map/npc/items/mirror.txt
index 0c200efa..fc2ca69b 100644
--- a/world/map/npc/items/mirror.txt
+++ b/world/map/npc/items/mirror.txt
@@ -5,8 +5,6 @@ function|script|useMirror|,
L_Rand:
set @style, rand(0,(getarraysize(@HairStyles$) -2));
- if(@style == 0)
- set @style, 20;
set @color, rand((15 * Class),((getarraysize(@HairColors$) -2) + (15 * Class)));
if((getlook(LOOK_HAIR_STYLE) == @style) || (getlook(LOOK_HAIR_COLOR) == @color))
goto L_Rand;