add species selection to barber menu

3 files changed, 22 insertions, 14 deletions

diff --git a/client-data b/client-data
-Subproject f795cdbd41cb2938f5029436a9fc22450555658
+Subproject 8cc4345cd73addf0df0d32c5cc50e928552fc0b
diff --git a/world/map/npc/functions/barber.txt b/world/map/npc/functions/barber.txt
index 54732418..6bc97b75 100644
--- a/world/map/npc/functions/barber.txt
+++ b/world/map/npc/functions/barber.txt
@@ -35,6 +35,7 @@ L_Main:
         "Change my style", L_Style,
         "Change my color", L_Color,
         "Change my gender", L_Gender,
+        "Change my species", L_Species,
         "Nah, I'm fine", L_Done;
 
 L_Gender:
@@ -66,6 +67,20 @@ L_Already_Change:
     mes "\"Umm, you are that gender already.\"";
     return;
 
+L_Species:
+    menu
+        "Talpan", L_Species_next,
+        "Tritan", L_Species_next,
+        "Ifriton", L_Species_next,
+        //"Gispaan", L_Species_next,
+        //"Sparron", L_Species_next,
+        "Nah, I'm fine", L_Done;
+
+L_Species_next:
+    set Class, @menu;
+    callfunc "fixHeadStyles";
+    return;
+
 L_Style:
     if(!@hairOpts) set @HairStyles$[getarraysize(@HairStyles$)], "Surprise me";
     if(!@hairOpts) set @HairStyles$[getarraysize(@HairStyles$)], "Nah, I'm fine";
diff --git a/world/map/npc/functions/headstyles.txt b/world/map/npc/functions/headstyles.txt
index 2ddaa4a6..ee28868f 100644
--- a/world/map/npc/functions/headstyles.txt
+++ b/world/map/npc/functions/headstyles.txt
@@ -51,14 +51,10 @@ L_Talpan:
 
 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";
+        "Finless",  "Mohawk",  "Dorsal",  "Translucid",  "Spiky",
+        "Dual dorsal",  "Helmet",  "Intricate",  "Lateral";
     setarray @HairColors$[0],
-        "1",  "2",  "3",  "4",  "5",
-        "6",  "7",  "8",  "9",  "10",
-        "11", "12", "13", "14", "15";
+        "Midori",  "Aqua",  "Mauve",  "Magenta",  "Jet";
     return;
 
 L_Gispaan:
@@ -87,13 +83,10 @@ L_Sparron:
 
 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";
+        "Plain",  "Horny",  "Kinky",  "Fiendish",  "Modest",
+        "Spiky";
     setarray @HairColors$[0],
-        "1",  "2",  "3",  "4",  "5",
-        "6",  "7",  "8",  "9",  "10",
-        "11", "12", "13", "14", "15";
+        "Natural",  "Fiery",  "Bold",  "Blazing",  "Spunky",
+        "Gloomy";
     return;
 }