1 files changed, 38 insertions, 49 deletions

diff --git a/npc/003-1/tamiloc.txt b/npc/003-1/tamiloc.txt
index 9d6519ad4..007e260e6 100644
--- a/npc/003-1/tamiloc.txt
+++ b/npc/003-1/tamiloc.txt
@@ -2,77 +2,66 @@
 // Authors:
 //    Saulc
 //    Jesusalva
-//    The Evol Team (debug-look.txt)
+//    Reid
+//    Travolta
 // Description:
-//    For a while, the Barber will be Tamiloc, until we either move it or keep it.
+//    For a while, the Barber will be Tamiloc, until we decide to either move it or keep it.
 
 003-1,49,43,0	script	Tamiloc	NPC_ELVEN_FEMALE_ARMOR_SHOP,{
-    function setStyle {
-        clear;
-        mes l("Hair style") + ": " + getlook(LOOK_HAIR);
-        next;
-        mes l("Please enter the desired hair style");
-        switch (select("Bald:Bowl Cut:Combed Back:Emo:Mohawk:Pompadour:Center Parting:Long and Slick:Short and Curly:Pigtails:Long and Curly:Parted:Perky Ponytail:Wave:Mane:Bun:Wavy:Bunches:Long Ponytail:Infinitely Long:Choppy:Wild:Punk:Imperial:Side Strand:Messy:Flat Ponytail:Tapered Nape"))
-        {
-            default:
-                setlook LOOK_HAIR, max(1, @menu);
-        }
-        return;
-    }
-    function setColor {
-        clear;
-        mes l("Hair color") + ": " + getlook(LOOK_HAIR_COLOR);
-        next;
-        mes l("Please enter the desired hair color");
-        switch (select("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:Royal Blue"))
-        {
-            default:
-                setlook LOOK_HAIR_COLOR, max(0, @menu-1);
-        }
-        return;
-    }
     function setRace {
         clear;
-        setnpcdialogtitle l("Debug - Race");
-        mes l("Race") + ": " + Class;
+        setnpcdialogtitle l("Debug - Modify Race");
+        mes l("Race") + ": " + $@allraces$[Class];
         next;
-        mes l("Please enter the desired race.");
+        mes l("Please select the desired race.");
         switch (select("Human:Ukar:Redy:Elf:Orc:Raijin:Tritan"))
         {
             default:
-                jobchange max(0, menu-1);
+                jobchange max(0, @menu-1);
         }
         return;
     }
 
 
-
-
-
-
-
-
     mesn;
     mesq l("Hi! Do you want a hair cut?");
-    mes l("Hair style") + ": " + getlook(LOOK_HAIR);
-    mes l("Hair color") + ": " + getlook(LOOK_HAIR_COLOR);
-
-    if (getgmlevel())
-        mes l("Race") + ": " + Class;
 
+    do
+    {
         select
-            l("Hair style"),
-            l("Hair color"),
-            rif(getgmlevel(), l("Race")),
-            l("Abort");
+            l("What is my current hairstyle and hair color?"),
+            l("I'd like to get a different style."),
+            l("Can you do something with my color?"),
+            rif(getgmlevel(), l("I am a GM, and I want to change my Race!")),
+            l("I'm fine for now, thank you.");
 
         switch (@menu)
         {
-            case 1: setStyle; break;
-            case 2: setColor; break;
-            case 3: setRace; break;
-            case 4: close;
+            case 1:
+                BarberSayStyle 3;
+                break;
+            case 2:
+                BarberChangeStyle;
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                    l("Enjoy your new style.");
+                    l("Anything else?");
+                break;
+            case 3:
+                BarberChangeColor;
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                    l("I hope you like this color.");
+                    l("Anything else?");
+                break;
+            case 4:
+                setRace;
+                break;
+            case 5:
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                    l("Feel free to come visit me another time.");
+
+                goodbye;
         }
+    } while (1);
     close;