This askes logmes to log at LOGMES_ ATCOMMAND and includes a draft about barber

4 files changed, 76 insertions, 6 deletions

diff --git a/npc/003-1/tamiloc.txt b/npc/003-1/tamiloc.txt
index 6d42a41e0..9d6519ad4 100644
--- a/npc/003-1/tamiloc.txt
+++ b/npc/003-1/tamiloc.txt
@@ -1,11 +1,80 @@
 // TMW2 scripts.
 // Authors:
 //    Saulc
-
+//    Jesusalva
+//    The Evol Team (debug-look.txt)
+// Description:
+//    For a while, the Barber will be Tamiloc, until we 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;
+        next;
+        mes l("Please enter the desired race.");
+        switch (select("Human:Ukar:Redy:Elf:Orc:Raijin:Tritan"))
+        {
+            default:
+                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;
+
+        select
+            l("Hair style"),
+            l("Hair color"),
+            rif(getgmlevel(), l("Race")),
+            l("Abort");
+
+        switch (@menu)
+        {
+            case 1: setStyle; break;
+            case 2: setColor; break;
+            case 3: setRace; break;
+            case 4: close;
+        }
+    close;
 
-    hello;
 
 OnInit:
     .sex = G_FEMALE;
diff --git a/npc/003-2/lua.txt b/npc/003-2/lua.txt
index 9a8500e49..92d927ac1 100644
--- a/npc/003-2/lua.txt
+++ b/npc/003-2/lua.txt
@@ -24,6 +24,7 @@ L_GMItems:
     getnameditem "GMRobe", strcharinfo(0);
     getnameditem "GMCap", strcharinfo(0);
     logmes(strcharinfo(0)+" just took a GM set.");
+    logmes("@GMSet "+strcharinfo(0), LOGMES_ATCOMMAND);
     mes "";
     mesn;
     mesq lg("Here they are, miss.", "Here they are, mister.");
diff --git a/npc/commands/motd.txt b/npc/commands/motd.txt
index 6a6ba6123..3867c8513 100644
--- a/npc/commands/motd.txt
+++ b/npc/commands/motd.txt
@@ -40,7 +40,7 @@ function	script	MOTDConfig	{
             .@size = getvariableofnpc(.size, "@motd");
             $MOTD_Messages$[.@size] = .@s$;
             set getvariableofnpc(.size, "@motd"), getarraysize($MOTD_Messages$);
-            logmes "MOTD modified: line added";
+            logmes "MOTD modified: line added", LOGMES_ATCOMMAND;
             // FIXME: log to GM log
         }
     }
@@ -52,7 +52,7 @@ function	script	MOTDConfig	{
             deletearray $MOTD_Messages$[.@l], 1; // remove and shift
             mes l("Line @@ has been removed.", .@l);
             set getvariableofnpc(.size, "@motd"), getarraysize($MOTD_Messages$);
-            logmes "MOTD modified: line removed";
+            logmes "MOTD modified: line removed", LOGMES_ATCOMMAND;
             // FIXME: log to GM log
         }
 
@@ -85,7 +85,7 @@ function	script	MOTDConfig	{
             if (.@s$ != "")
             {
                 $MOTD_Messages$[.@l] = .@s$;
-                logmes "MOTD modified: line edited";
+                logmes "MOTD modified: line edited", LOGMES_ATCOMMAND;
                 // FIXME: log to GM log
             }
         }
diff --git a/npc/commands/scheduled-broadcasts.txt b/npc/commands/scheduled-broadcasts.txt
index 38aa23b69..4ea5a5a71 100644
--- a/npc/commands/scheduled-broadcasts.txt
+++ b/npc/commands/scheduled-broadcasts.txt
@@ -123,7 +123,7 @@ function	script	StoneBoard	{
                         {
                             announce $@SCHED_Msg$, bc_all;
                         }
-                        logmes "Scheduled Broadcast: A new broadcast was added";
+                        logmes "Scheduled Broadcast: A new broadcast was added", LOGMES_ATCOMMAND;
                 case 1: return;
             }