summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/functions/headstyles.txt83
-rw-r--r--npc/items/mirror.txt5
-rw-r--r--npc/items/scissors.txt1
-rw-r--r--npc/items/shock_sweet.txt2
4 files changed, 7 insertions, 84 deletions
diff --git a/npc/functions/headstyles.txt b/npc/functions/headstyles.txt
index dd4be8e7..b0791d91 100644
--- a/npc/functions/headstyles.txt
+++ b/npc/functions/headstyles.txt
@@ -23,79 +23,6 @@ L_RandomHair:
return;
}
-function script getHeadStyles {
- cleararray @HairStyles$, "", getarraysize(@HairStyles$);
- cleararray @HairColors$, "", getarraysize(@HairColors$);
-
- if (Class == 2) goto L_Tritan;
- else if (Class == 3) goto L_Ifriton;
- else if (Class == 4) goto L_Gispaan;
- else if (Class == 5) goto L_Sparron;
- else set Class, 1; // we can not style custom classes, so reset when using the barber
- goto L_Talpan;
-
-L_Talpan:
- setarray @HairStyles$[0],
- "Bald", "Flat ponytail", "Bowl cut", "Combed back", "Emo", "Mohawk",
- "Pompadour", "Center parting/Short and slick", "Long and slick",
- "Short and curly", "Pigtails", "Long and curly", "Parted",
- "Perky ponytail", "Wave", "Mane", "Bun", "Shoulder Length Flick",
- "Fizzy", "Long and Clipped";
- setarray @HairColors$[0],
- "Brunette", "Green", "Dark red", "Light purple", "Gray", "Blonde",
- "Teal", "Light red", "Blue", "Dark purple", "Black", "Pink",
- "Brown";//, "(free slot)", "(free slot)";
- return;
-
-L_Tritan:
- setarray @HairStyles$[0],
- "1", "2", "3", "4", "5",
- "6", "7", "8", "9", "10",
- "11", "12", "13", "14", "15",
- "16", "17", "18", "19", "20";
- setarray @HairColors$[0],
- "1", "2", "3", "4", "5",
- "6", "7", "8", "9", "10",
- "11", "12", "13", "14", "15";
- return;
-
-L_Gispaan:
- setarray @HairStyles$[0],
- "1", "2", "3", "4", "5",
- "6", "7", "8", "9", "10",
- "11", "12", "13", "14", "15",
- "16", "17", "18", "19", "20";
- setarray @HairColors$[0],
- "1", "2", "3", "4", "5",
- "6", "7", "8", "9", "10",
- "11", "12", "13", "14", "15";
- return;
-
-L_Sparron:
- setarray @HairStyles$[0],
- "1", "2", "3", "4", "5",
- "6", "7", "8", "9", "10",
- "11", "12", "13", "14", "15",
- "16", "17", "18", "19", "20";
- setarray @HairColors$[0],
- "1", "2", "3", "4", "5",
- "6", "7", "8", "9", "10",
- "11", "12", "13", "14", "15";
- return;
-
-L_Ifriton:
- setarray @HairStyles$[0],
- "1", "2", "3", "4", "5",
- "6", "7", "8", "9", "10",
- "11", "12", "13", "14", "15",
- "16", "17", "18", "19", "20";
- setarray @HairColors$[0],
- "1", "2", "3", "4", "5",
- "6", "7", "8", "9", "10",
- "11", "12", "13", "14", "15";
- return;
-}
-
// Hairstyle config
// set array of style and colors
- script hairstyle_config NPC_HIDDEN,{
@@ -110,12 +37,10 @@ OnInit:
"Imperial", "Side strand", "Messy", "Flat ponytail",
"Tapered Nape";
- setarray $@haircolor$[0], "Off black", "Ash brown", "Dark brown",
- "Dark copper", "Auburn brown", "Honey brown", "Copper blonde",
- "Golden blonde", "Pure platinum", "Cherry blossom", "Pinky pink",
- "Fire red", "Light violet", "Purple plum", "Navy blue",
- "Lagoon blue", "Twisted teal", "Spring Green", "Forest Green",
- "Silver Grey", "Esperia Blue";
+ setarray $@haircolor$[0], "Light Brown", "Green", "Red",
+ "Purple", "Gray", "Yellow", "Blue",
+ "Light Red", "Light Blue", "Dark Purple", "Black",
+ "Pink", "Brown", "Dark;
setarray $@REFEXP[0], 400, 900, 2250, 6500, 15000;
end;
diff --git a/npc/items/mirror.txt b/npc/items/mirror.txt
index b29e7fec..db673011 100644
--- a/npc/items/mirror.txt
+++ b/npc/items/mirror.txt
@@ -1,11 +1,10 @@
function script useMirror {
- callfunc "getHeadStyles";
goto L_Rand;
L_Rand:
.@mirror_rnd = .@mirror_rnd + 1;
- @style = rand(1,getarraysize($@hairstyle$)-1);
- @color = rand(getarraysize($@haircolor$));
+ @style = rand2(1,getarraysize($@hairstyle$)-1);
+ @color = rand2(getarraysize($@haircolor$));
if (((getlook(LOOK_HAIR_STYLE) == @style) ||
(getlook(LOOK_HAIR_COLOR) == @color)) &&
.@mirror_rnd < 15)
diff --git a/npc/items/scissors.txt b/npc/items/scissors.txt
index b21a36e8..95d07b8b 100644
--- a/npc/items/scissors.txt
+++ b/npc/items/scissors.txt
@@ -7,7 +7,6 @@ function script useScissors {
return;
L_Change:
- callfunc "getHeadStyles";
setlook LOOK_HAIR_STYLE, rand(1,getarraysize($@hairstyle$)-1);
return;
}
diff --git a/npc/items/shock_sweet.txt b/npc/items/shock_sweet.txt
index f1f1df71..c35ce37f 100644
--- a/npc/items/shock_sweet.txt
+++ b/npc/items/shock_sweet.txt
@@ -6,7 +6,7 @@ function script useShockSweet {
return;
L_Change:
- setlook LOOK_HAIR_COLOR, (HC_WHITE - Class) + 1;
+ setlook LOOK_HAIR_COLOR, 122;
message strcharinfo(0), "Gah! That was some strong stuff!";
sc_start SC_POISON, 1, 20;
misceffect 15, strcharinfo(0);